summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/generic.c
diff options
context:
space:
mode:
authorGreg KH <greg@press.(none)>2005-10-28 19:13:16 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2005-10-28 19:13:16 +0200
commit6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (patch)
treec0414e89678fcef7ce3493e048d855bde781ae8d /arch/arm/mach-imx/generic.c
parent[PATCH] Fix documentation of driver suspend/resume callbacks (diff)
parentMerge master.kernel.org:/home/rmk/linux-2.6-mmc (diff)
downloadlinux-6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5.tar.xz
linux-6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5.zip
Merge ../bleed-2.6
Diffstat (limited to 'arch/arm/mach-imx/generic.c')
-rw-r--r--arch/arm/mach-imx/generic.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/generic.c b/arch/arm/mach-imx/generic.c
index f8a742bb2d5b..cb14b0682cef 100644
--- a/arch/arm/mach-imx/generic.c
+++ b/arch/arm/mach-imx/generic.c
@@ -273,8 +273,12 @@ static struct platform_device *devices[] __initdata = {
};
static struct map_desc imx_io_desc[] __initdata = {
- /* virtual physical length type */
- {IMX_IO_BASE, IMX_IO_PHYS, IMX_IO_SIZE, MT_DEVICE},
+ {
+ .virtual = IMX_IO_BASE,
+ .pfn = __phys_to_pfn(IMX_IO_PHYS),
+ .length = IMX_IO_SIZE,
+ .type = MT_DEVICE
+ }
};
void __init