]>
Commit | Line | Data |
---|---|---|
2a78041a AF |
1 | diff -Naur linux-3.14.76.org/arch/arm/mach-omap2/cclock3xxx_data.c linux-3.14.76/arch/arm/mach-omap2/cclock3xxx_data.c |
2 | --- linux-3.14.76.org/arch/arm/mach-omap2/cclock3xxx_data.c 2016-08-18 06:26:02.000000000 +0200 | |
3 | +++ linux-3.14.76/arch/arm/mach-omap2/cclock3xxx_data.c 2016-08-18 06:37:51.442186995 +0200 | |
f295ca0c MT |
4 | @@ -250,7 +250,7 @@ |
5 | ||
6 | static struct clk dpll1_ck; | |
7 | ||
2a78041a AF |
8 | -static struct clk_ops dpll1_ck_ops; |
9 | +static clk_ops_no_const dpll1_ck_ops; | |
10 | ||
11 | static struct clk_ops dpll1_ck_ops_34xx __initdata = { | |
f295ca0c | 12 | .init = &omap2_init_clk_clkdm, |
2a78041a AF |
13 | diff -Naur linux-3.14.76.org/net/ipv6/addrconf.c linux-3.14.76/net/ipv6/addrconf.c |
14 | --- linux-3.14.76.org/net/ipv6/addrconf.c 2016-08-18 06:25:51.000000000 +0200 | |
15 | +++ linux-3.14.76/net/ipv6/addrconf.c 2016-08-18 06:31:51.802186824 +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; |