diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-10-31 13:51:57 -0500 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-10-31 13:51:57 -0500 |
| commit | c7fb577e2a6cb04732541f2dc402bd46747f7558 (patch) | |
| tree | df3b1a1922ed13bfbcc45d08650c38beeb1a7bd1 /include/asm-arm/io.h | |
| parent | 9cec58dc138d6fcad9f447a19c8ff69f6540e667 (diff) | |
| parent | 581c1b14394aee60aff46ea67d05483261ed6527 (diff) | |
manual update from upstream:
Applied Al's change 06a544971fad0992fe8b92c5647538d573089dd4
to new location of swiotlb.c
Signed-off-by: Tony Luck <tony.luck@intel.com>
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 5c4ae8f5dbb0..2e6799632f12 100644 --- a/include/asm-arm/io.h +++ b/include/asm-arm/io.h | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #include <linux/types.h> | 26 | #include <linux/types.h> |
| 27 | #include <asm/byteorder.h> | 27 | #include <asm/byteorder.h> |
| 28 | #include <asm/memory.h> | 28 | #include <asm/memory.h> |
| 29 | #include <asm/arch/hardware.h> | ||
| 30 | 29 | ||
| 31 | /* | 30 | /* |
| 32 | * ISA I/O bus memory addresses are 1:1 with the physical address. | 31 | * ISA I/O bus memory addresses are 1:1 with the physical address. |