diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-18 18:10:13 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-18 18:10:13 +0200 |
| commit | ef4669db0c9d5f06d5fd169fa461289723a93a91 (patch) | |
| tree | b77ea6e73205326295566d896eda1e2df59383a6 /arch/arm/lib/io-writesw-armv3.S | |
| parent | 0bf6b1da1a53e8414d954251b1d13e2cdbd499b4 (diff) | |
| parent | cc22b4c18540e5e8bf55c7d124044f9317527d3c (diff) | |
Merge branch 'next/cross-platform' into for-next
Diffstat (limited to 'arch/arm/lib/io-writesw-armv3.S')
| -rw-r--r-- | arch/arm/lib/io-writesw-armv3.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/lib/io-writesw-armv3.S b/arch/arm/lib/io-writesw-armv3.S index cd34503e424..49b800419e3 100644 --- a/arch/arm/lib/io-writesw-armv3.S +++ b/arch/arm/lib/io-writesw-armv3.S @@ -9,7 +9,6 @@ */ #include <linux/linkage.h> #include <asm/assembler.h> -#include <mach/hardware.h> .Loutsw_bad_alignment: adr r0, .Loutsw_bad_align_msg |