]>
Commit | Line | Data |
---|---|---|
de2ee80d AF |
1 | diff -Naur linux-3.14.74.org/arch/arm/mach-omap2/cclock3xxx_data.c linux-3.14.74/arch/arm/mach-omap2/cclock3xxx_data.c |
2 | --- linux-3.14.74.org/arch/arm/mach-omap2/cclock3xxx_data.c 2016-07-27 18:56:02.000000000 +0200 | |
3 | +++ linux-3.14.74/arch/arm/mach-omap2/cclock3xxx_data.c 2016-07-29 01:47:45.272515907 +0200 | |
f295ca0c MT |
4 | @@ -250,7 +250,7 @@ |
5 | ||
6 | static struct clk dpll1_ck; | |
7 | ||
de2ee80d AF |
8 | -static const struct clk_ops dpll1_ck_ops = { |
9 | +static clk_ops_no_const dpll1_ck_ops = { | |
f295ca0c | 10 | .init = &omap2_init_clk_clkdm, |
de2ee80d AF |
11 | .enable = &omap3_noncore_dpll_enable, |
12 | .disable = &omap3_noncore_dpll_disable, | |
13 | diff -Naur linux-3.14.74.org/net/ipv6/addrconf.c linux-3.14.74/net/ipv6/addrconf.c | |
14 | --- linux-3.14.74.org/net/ipv6/addrconf.c 2016-07-29 03:47:13.000000000 +0200 | |
15 | +++ linux-3.14.74/net/ipv6/addrconf.c 2016-07-29 00:47:00.000000000 +0200 | |
822b4313 AF |
16 | @@ -4818,7 +4818,7 @@ |
17 | { | |
18 | struct inet6_dev *idev = ctl->extra1; | |
19 | int min_mtu = IPV6_MIN_MTU; | |
20 | - struct ctl_table lctl; | |
21 | + ctl_table_no_const lctl; | |
22 | ||
23 | lctl = *ctl; | |
24 | lctl.extra1 = &min_mtu; |