diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-07 17:32:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-07 17:32:57 -0700 |
| commit | 9d21f09ca03d1142f1988001f228d02581d8986c (patch) | |
| tree | ae2d485159ac4c3cbc2e4e5269434236c2de9104 /arch/arm/mach-aaec2000/core.c | |
| parent | f5b40e363ad6041a96e3da32281d8faa191597b9 (diff) | |
| parent | 74fae122eb9f0db8b8718b9851c31c2f374fb134 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3507/1: Replace map_desc.physical with map_desc.pfn: aaed2000
[ARM] 3506/1: aaec2000: debug-macro.S needs hardware.h
[ARM] 3505/1: aaec2000: entry-macro.S needs asm/arch/irqs.h
[ARM] 3504/1: Fix clcd includes for aaec2000
[ARM] 3503/1: Fix map_desc structure for aaec2000
[ARM] 3501/1: i.MX: fix lowlevel debug macros
[ARM] rtc-sa1100: fix compiler warnings and error cleanup
[ARM] Allow SA1100 RTC alarm to be configured for wakeup
Diffstat (limited to 'arch/arm/mach-aaec2000/core.c')
| -rw-r--r-- | arch/arm/mach-aaec2000/core.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-aaec2000/core.c b/arch/arm/mach-aaec2000/core.c index dce4815cf53c..65be5efd633c 100644 --- a/arch/arm/mach-aaec2000/core.c +++ b/arch/arm/mach-aaec2000/core.c @@ -20,7 +20,6 @@ #include <linux/interrupt.h> #include <linux/timex.h> #include <linux/signal.h> -#include <linux/amba/bus.h> #include <asm/hardware.h> #include <asm/irq.h> @@ -50,12 +49,12 @@ static struct map_desc standard_io_desc[] __initdata = { { .virtual = VIO_APB_BASE, - .physical = __phys_to_pfn(PIO_APB_BASE), + .pfn = __phys_to_pfn(PIO_APB_BASE), .length = IO_APB_LENGTH, .type = MT_DEVICE }, { .virtual = VIO_AHB_BASE, - .physical = __phys_to_pfn(PIO_AHB_BASE), + .pfn = __phys_to_pfn(PIO_AHB_BASE), .length = IO_AHB_LENGTH, .type = MT_DEVICE } |