diff options
author | 2012-11-20 22:21:32 -0800 | |
---|---|---|
committer | 2012-11-20 22:21:32 -0800 | |
commit | a93d620159524088d9633f60a8f746e3dd2e791e (patch) | |
tree | 09da5c10d18adc2b27ee88dcf5673e92d49b4043 /arch/arm/mach-clps711x/cdb89712.c | |
parent | GPIO: clps711x: use platform_device_unregister in gpio_clps711x_init() (diff) | |
parent | ARM: clps711x: merge files related to EDB7211-board into one (diff) | |
download | linux-dev-a93d620159524088d9633f60a8f746e3dd2e791e.tar.xz linux-dev-a93d620159524088d9633f60a8f746e3dd2e791e.zip |
Merge branch 'clps711x/soc' into clps711x/soc2
Conflicts:
arch/arm/Kconfig
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-clps711x/cdb89712.c')
-rw-r--r-- | arch/arm/mach-clps711x/cdb89712.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-clps711x/cdb89712.c b/arch/arm/mach-clps711x/cdb89712.c index c314f49d6ef6..d90d25c67ac2 100644 --- a/arch/arm/mach-clps711x/cdb89712.c +++ b/arch/arm/mach-clps711x/cdb89712.c @@ -40,8 +40,8 @@ */ static struct map_desc cdb89712_io_desc[] __initdata = { { - .virtual = ETHER_BASE, - .pfn =__phys_to_pfn(ETHER_START), + .virtual = IO_ADDRESS(ETHER_PHYS_BASE), + .pfn = __phys_to_pfn(ETHER_PHYS_BASE), .length = ETHER_SIZE, .type = MT_DEVICE } |