diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-01 14:15:02 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-01 14:15:02 -0700 |
| commit | ed0a0ed0a4e0e6eeebfa154f97ebb41abc5bbee8 (patch) | |
| tree | 3ca115b6580b70b20d21da179f004b14f54edc8e /arch/arm/mach-iop13xx/pci.h | |
| parent | 17a505edb09495510ac8998450980472c412455b (diff) | |
| parent | 9cf1c871526cf6bfec2a653e1e068ee72592542c (diff) | |
| download | linux-3.10-ed0a0ed0a4e0e6eeebfa154f97ebb41abc5bbee8.tar.gz linux-3.10-ed0a0ed0a4e0e6eeebfa154f97ebb41abc5bbee8.tar.bz2 linux-3.10-ed0a0ed0a4e0e6eeebfa154f97ebb41abc5bbee8.zip | |
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-iop13xx/pci.h')
| -rw-r--r-- | arch/arm/mach-iop13xx/pci.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-iop13xx/pci.h b/arch/arm/mach-iop13xx/pci.h index c70cf5b41e3..d45a80b3080 100644 --- a/arch/arm/mach-iop13xx/pci.h +++ b/arch/arm/mach-iop13xx/pci.h @@ -1,6 +1,6 @@ #include <linux/types.h> -extern u32 iop13xx_atue_mem_base; -extern u32 iop13xx_atux_mem_base; +extern void __iomem *iop13xx_atue_mem_base; +extern void __iomem *iop13xx_atux_mem_base; extern size_t iop13xx_atue_mem_size; extern size_t iop13xx_atux_mem_size; |