diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:24:43 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:24:43 +0200 |
| commit | 8bbd54d69e9c66adbf544e21d8dcfb15fb9198f7 (patch) | |
| tree | 95f30814fc759c2cb523dbea95bc531c7f8f3231 /include/asm-arm/arch-omap/hardware.h | |
| parent | softlockup: fix NMI hangs due to lock race - 2.6.26-rc regression (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
| download | linux-8bbd54d69e9c66adbf544e21d8dcfb15fb9198f7.tar.xz linux-8bbd54d69e9c66adbf544e21d8dcfb15fb9198f7.zip | |
Merge branch 'linus' into core/softlockup
Diffstat (limited to 'include/asm-arm/arch-omap/hardware.h')
| -rw-r--r-- | include/asm-arm/arch-omap/hardware.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-arm/arch-omap/hardware.h b/include/asm-arm/arch-omap/hardware.h index da572092e255..91d85b3417b7 100644 --- a/include/asm-arm/arch-omap/hardware.h +++ b/include/asm-arm/arch-omap/hardware.h @@ -41,7 +41,6 @@ #include <asm/types.h> #include <asm/arch/cpu.h> #endif -#include <asm/arch/io.h> #include <asm/arch/serial.h> /* |