diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 09:24:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 09:24:22 -0700 |
| commit | 83928e17b92b7a667bfe674f1b330619adc2ac88 (patch) | |
| tree | bdfc0fd037ad1380d75cefa0e47be24e344d977c /include/asm-arm/io.h | |
| parent | 9be16a03928642f944915b8c05945fd87b7a15cb (diff) | |
| parent | 50f4c001bc1534db77663592496204ceba151e97 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Minor manual fixups for gfp_t clashes.
Diffstat (limited to 'include/asm-arm/io.h')
| -rw-r--r-- | include/asm-arm/io.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-arm/io.h b/include/asm-arm/io.h index 5c4ae8f5dbb..2e6799632f1 100644 --- a/include/asm-arm/io.h +++ b/include/asm-arm/io.h @@ -26,7 +26,6 @@ #include <linux/types.h> #include <asm/byteorder.h> #include <asm/memory.h> -#include <asm/arch/hardware.h> /* * ISA I/O bus memory addresses are 1:1 with the physical address. |