diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-06 17:01:27 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-06 17:01:27 +0200 |
| commit | 907bc6c7fc7071b00083fc11e510e47dd93df45d (patch) | |
| tree | 0697a608561522c00da9e1814974a2eb051bb96d /arch/arm/mach-omap1/io.c | |
| parent | ASoC: Add virtual enumeration support for DAPM muxes (diff) | |
| parent | Merge branch 'for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/br... (diff) | |
| download | linux-907bc6c7fc7071b00083fc11e510e47dd93df45d.tar.xz linux-907bc6c7fc7071b00083fc11e510e47dd93df45d.zip | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'arch/arm/mach-omap1/io.c')
| -rw-r--r-- | arch/arm/mach-omap1/io.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c index 3afe540149f7..7030f9281ea1 100644 --- a/arch/arm/mach-omap1/io.c +++ b/arch/arm/mach-omap1/io.c @@ -29,9 +29,9 @@ extern void omapfb_reserve_sdram(void); */ static struct map_desc omap_io_desc[] __initdata = { { - .virtual = IO_VIRT, - .pfn = __phys_to_pfn(IO_PHYS), - .length = IO_SIZE, + .virtual = OMAP1_IO_VIRT, + .pfn = __phys_to_pfn(OMAP1_IO_PHYS), + .length = OMAP1_IO_SIZE, .type = MT_DEVICE } }; |