diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:50:09 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:50:09 -0400 |
| commit | 9dfb7808fb05643b0d06df7411b94d9546696bf1 (patch) | |
| tree | aa1a9cc1e79ae66f6cbb0fe39d79a80ca76331e8 /arch/arm/mach-h720x/common.c | |
| parent | c45154a3b1fecdbb51b5462c9f730b44e62b83a5 (diff) | |
| parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/arm/mach-h720x/common.c')
| -rw-r--r-- | arch/arm/mach-h720x/common.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-h720x/common.c b/arch/arm/mach-h720x/common.c index 5110e2e65ddd..c096b4569308 100644 --- a/arch/arm/mach-h720x/common.c +++ b/arch/arm/mach-h720x/common.c | |||
| @@ -237,7 +237,12 @@ void __init h720x_init_irq (void) | |||
| 237 | } | 237 | } |
| 238 | 238 | ||
| 239 | static struct map_desc h720x_io_desc[] __initdata = { | 239 | static struct map_desc h720x_io_desc[] __initdata = { |
| 240 | { IO_VIRT, IO_PHYS, IO_SIZE, MT_DEVICE }, | 240 | { |
| 241 | .virtual = IO_VIRT, | ||
| 242 | .pfn = __phys_to_pfn(IO_PHYS), | ||
| 243 | .length = IO_SIZE, | ||
| 244 | .type = MT_DEVICE | ||
| 245 | }, | ||
| 241 | }; | 246 | }; |
| 242 | 247 | ||
| 243 | /* Initialize io tables */ | 248 | /* Initialize io tables */ |