diff options
author | Olof Johansson <olof@lixom.net> | 2012-10-02 01:15:02 +0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-10-02 01:15:02 +0400 |
commit | ed0a0ed0a4e0e6eeebfa154f97ebb41abc5bbee8 (patch) | |
tree | 3ca115b6580b70b20d21da179f004b14f54edc8e /arch/arm/mach-imx/mach-mx31lite.c | |
parent | 17a505edb09495510ac8998450980472c412455b (diff) | |
parent | 9cf1c871526cf6bfec2a653e1e068ee72592542c (diff) | |
download | linux-ed0a0ed0a4e0e6eeebfa154f97ebb41abc5bbee8.tar.xz |
Merge branch 'next/cleanup' into HEAD
Conflicts:
drivers/staging/tidspbridge/core/wdt.c
drivers/usb/host/Kconfig
drivers/w1/masters/omap_hdq.c
Diffstat (limited to 'arch/arm/mach-imx/mach-mx31lite.c')
-rw-r--r-- | arch/arm/mach-imx/mach-mx31lite.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-mx31lite.c b/arch/arm/mach-imx/mach-mx31lite.c index c8785b39eaed..ef57cff5abfb 100644 --- a/arch/arm/mach-imx/mach-mx31lite.c +++ b/arch/arm/mach-imx/mach-mx31lite.c @@ -207,7 +207,7 @@ static struct platform_device physmap_flash_device = { */ static struct map_desc mx31lite_io_desc[] __initdata = { { - .virtual = MX31_CS4_BASE_ADDR_VIRT, + .virtual = (unsigned long)MX31_CS4_BASE_ADDR_VIRT, .pfn = __phys_to_pfn(MX31_CS4_BASE_ADDR), .length = MX31_CS4_SIZE, .type = MT_DEVICE |