diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-09 08:48:51 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-09 08:48:51 -0700 |
| commit | 782cd9ee985b1523f1ddad57657a24d7855d9e4d (patch) | |
| tree | c60c540c4799ad412161dd11090cee815926efe7 /arch/arm/mach-integrator/include/mach/platform.h | |
| parent | 6e3a78d9474f54c0b2b5293a561548106243eeaf (diff) | |
| parent | 21c8715f0a1f4df8bfa2bd6f3915e5e33c1c2e6e (diff) | |
Merge branch 'fixes2' into fixes
Three more warnings fixes from Arnd Bergmann:
* fixes2:
ARM: integrator: use __iomem pointers for MMIO, part 2
ARM: assabet: fix bogus warning in get_assabet_scr (again)
ARM: shmobile: mark shmobile_init_late as __init
Diffstat (limited to 'arch/arm/mach-integrator/include/mach/platform.h')
| -rw-r--r-- | arch/arm/mach-integrator/include/mach/platform.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-integrator/include/mach/platform.h b/arch/arm/mach-integrator/include/mach/platform.h index 4c0347526851..efeac5d0bc9e 100644 --- a/arch/arm/mach-integrator/include/mach/platform.h +++ b/arch/arm/mach-integrator/include/mach/platform.h @@ -324,9 +324,9 @@ */ #define PHYS_PCI_V3_BASE 0x62000000 -#define PCI_MEMORY_VADDR 0xe8000000 -#define PCI_CONFIG_VADDR 0xec000000 -#define PCI_V3_VADDR 0xed000000 +#define PCI_MEMORY_VADDR IOMEM(0xe8000000) +#define PCI_CONFIG_VADDR IOMEM(0xec000000) +#define PCI_V3_VADDR IOMEM(0xed000000) /* ------------------------------------------------------------------------ * Integrator Interrupt Controllers |