diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-10-20 13:41:44 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-10-20 13:41:44 -0400 |
| commit | 9cec58dc138d6fcad9f447a19c8ff69f6540e667 (patch) | |
| tree | 4fe1cca94fdba8b705c87615bee06d3346f687ce /arch/arm/mach-iop3xx/common.c | |
| parent | 17e5ad6c0ce5a970e2830d0de8bdd60a2f077d38 (diff) | |
| parent | ac9b9c667c2e1194e22ebe0a441ae1c37aaa9b90 (diff) | |
Update from upstream with manual merge of Yasunori Goto's
changes to swiotlb.c made in commit 281dd25cdc0d6903929b79183816d151ea626341
since this file has been moved from arch/ia64/lib/swiotlb.c to
lib/swiotlb.c
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/arm/mach-iop3xx/common.c')
| -rw-r--r-- | arch/arm/mach-iop3xx/common.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-iop3xx/common.c b/arch/arm/mach-iop3xx/common.c index bda7394ec06..fdeeef489a7 100644 --- a/arch/arm/mach-iop3xx/common.c +++ b/arch/arm/mach-iop3xx/common.c | |||
| @@ -27,7 +27,6 @@ unsigned long iop3xx_pcibios_min_mem = 0; | |||
| 27 | /* | 27 | /* |
| 28 | * Default power-off for EP80219 | 28 | * Default power-off for EP80219 |
| 29 | */ | 29 | */ |
| 30 | #include <asm/mach-types.h> | ||
| 31 | 30 | ||
| 32 | static inline void ep80219_send_to_pic(__u8 c) { | 31 | static inline void ep80219_send_to_pic(__u8 c) { |
| 33 | } | 32 | } |