diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-05-16 16:27:24 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-05-16 16:27:27 +1000 |
| commit | 64acc0549fea1b404b88c1354813886364902488 (patch) | |
| tree | a90961be933d562e42a0e592ead836a225653e65 /arch/powerpc/platforms/amigaone | |
| parent | 0856ad1ef175c45dc6a0bc629ca355fdfbb1001e (diff) | |
| parent | 6456b00c4f4ac3774506ff54242a8849172cb650 (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
arch/x86/kernel/apic/hw_nmi.c
mm/memblock.c
mm/memcontrol.c
Diffstat (limited to 'arch/powerpc/platforms/amigaone')
| -rw-r--r-- | arch/powerpc/platforms/amigaone/setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/amigaone/setup.c b/arch/powerpc/platforms/amigaone/setup.c index 03aabc0e16ac..2fe12046279e 100644 --- a/arch/powerpc/platforms/amigaone/setup.c +++ b/arch/powerpc/platforms/amigaone/setup.c @@ -24,6 +24,7 @@ #include <asm/i8259.h> #include <asm/time.h> #include <asm/udbg.h> +#include <asm/dma.h> extern void __flush_disable_L1(void); |