diff options
| author | David S. Miller <davem@davemloft.net> | 2019-06-27 21:06:39 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-27 21:06:39 -0700 |
| commit | d96ff269a04be286989ead13bf8b4be55bdee8ee (patch) | |
| tree | 46b6d010a9a4dfe96dc86339d1cbded8874c6b8f /arch/arm/mach-omap2/prm3xxx.c | |
| parent | 3a49584477ff4c8838833be9f3b7cc13f0f7c0d3 (diff) | |
| parent | 556e2f6020bf90f63c5dd65e9a2254be6db3185b (diff) | |
| download | linux-d96ff269a04be286989ead13bf8b4be55bdee8ee.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The new route handling in ip_mc_finish_output() from 'net' overlapped
with the new support for returning congestion notifications from BPF
programs.
In order to handle this I had to take the dev_loopback_xmit() calls
out of the switch statement.
The aquantia driver conflicts were simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/mach-omap2/prm3xxx.c')
| -rw-r--r-- | arch/arm/mach-omap2/prm3xxx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/prm3xxx.c b/arch/arm/mach-omap2/prm3xxx.c index fd4a3bf27993..1b442b128569 100644 --- a/arch/arm/mach-omap2/prm3xxx.c +++ b/arch/arm/mach-omap2/prm3xxx.c @@ -430,7 +430,7 @@ static void omap3_prm_reconfigure_io_chain(void) * registers, and omap3xxx_prm_reconfigure_io_chain() must be called. * No return value. */ -static void __init omap3xxx_prm_enable_io_wakeup(void) +static void omap3xxx_prm_enable_io_wakeup(void) { if (prm_features & PRM_HAS_IO_WAKEUP) omap2_prm_set_mod_reg_bits(OMAP3430_EN_IO_MASK, WKUP_MOD, |