diff options
| author | Greg KH <greg@press.(none)> | 2005-10-28 13:13:16 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 13:13:16 -0400 |
| commit | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (patch) | |
| tree | c0414e89678fcef7ce3493e048d855bde781ae8d /arch/arm/mach-sa1100/hackkit.c | |
| parent | 1a222bca26ca691e83be1b08f5e96ae96d0d8cae (diff) | |
| parent | 27d1097d39509494706eaa2620ef3b1e780a3224 (diff) | |
Merge ../bleed-2.6
Diffstat (limited to 'arch/arm/mach-sa1100/hackkit.c')
| -rw-r--r-- | arch/arm/mach-sa1100/hackkit.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-sa1100/hackkit.c b/arch/arm/mach-sa1100/hackkit.c index 502d65cfe654..c922e043c424 100644 --- a/arch/arm/mach-sa1100/hackkit.c +++ b/arch/arm/mach-sa1100/hackkit.c | |||
| @@ -57,8 +57,12 @@ static void hackkit_uart_pm(struct uart_port *port, u_int state, u_int oldstate) | |||
| 57 | */ | 57 | */ |
| 58 | 58 | ||
| 59 | static struct map_desc hackkit_io_desc[] __initdata = { | 59 | static struct map_desc hackkit_io_desc[] __initdata = { |
| 60 | /* virtual physical length type */ | 60 | { /* Flash bank 0 */ |
| 61 | { 0xe8000000, 0x00000000, 0x01000000, MT_DEVICE } /* Flash bank 0 */ | 61 | .virtual = 0xe8000000, |
| 62 | .pfn = __phys_to_pfn(0x00000000), | ||
| 63 | .length = 0x01000000, | ||
| 64 | .type = MT_DEVICE | ||
| 65 | }, | ||
| 62 | }; | 66 | }; |
| 63 | 67 | ||
| 64 | static struct sa1100_port_fns hackkit_port_fns __initdata = { | 68 | static struct sa1100_port_fns hackkit_port_fns __initdata = { |