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-bcmring/mm.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-bcmring/mm.c')
| -rw-r--r-- | arch/arm/mach-bcmring/mm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-bcmring/mm.c b/arch/arm/mach-bcmring/mm.c index 1adec78ec940..33824a81cac4 100644 --- a/arch/arm/mach-bcmring/mm.c +++ b/arch/arm/mach-bcmring/mm.c @@ -20,12 +20,12 @@ #include <mach/hardware.h> #include <mach/csp/mm_io.h> -#define IO_DESC(va, sz) { .virtual = va, \ +#define IO_DESC(va, sz) { .virtual = (unsigned long)va, \ .pfn = __phys_to_pfn(HW_IO_VIRT_TO_PHYS(va)), \ .length = sz, \ .type = MT_DEVICE } -#define MEM_DESC(va, sz) { .virtual = va, \ +#define MEM_DESC(va, sz) { .virtual = (unsigned long)va, \ .pfn = __phys_to_pfn(HW_IO_VIRT_TO_PHYS(va)), \ .length = sz, \ .type = MT_MEMORY } |