ARM: realview: don't map undefined PCI registers

PCI support for realview was never merged, and trying to build realview with
CONFIG_PCI enabled fails because the constants for the mapping windows are
not defined anywhere.

This removes them from the static I/O window mapping table as a preparation
for multiplatform support.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/mach-realview/realview_pba8.c b/arch/arm/mach-realview/realview_pba8.c
index 4c64662f54370f31b54089f90b869355a66030b8..b3549a637ff0822c207a14838d96c2480097d554 100644 (file)
--- a/arch/arm/mach-realview/realview_pba8.c
+++ b/arch/arm/mach-realview/realview_pba8.c
@@ -77,14 +77,6 @@ static struct map_desc realview_pba8_io_desc[] __initdata = {
                .length         = SZ_4K,
                .type           = MT_DEVICE,
        },
-#ifdef CONFIG_PCI
-       {
-               .virtual        = PCIX_UNIT_BASE,
-               .pfn            = __phys_to_pfn(REALVIEW_PBA8_PCI_BASE),
-               .length         = REALVIEW_PBA8_PCI_BASE_SIZE,
-               .type           = MT_DEVICE
-       },
-#endif
 #ifdef CONFIG_DEBUG_LL
        {
                .virtual        = IO_ADDRESS(REALVIEW_PBA8_UART0_BASE),

diff --git a/arch/arm/mach-realview/realview_pbx.c b/arch/arm/mach-realview/realview_pbx.c
index 9a22b864219f32562b66706ab1d083ffd46ed1fc..f26e1e09f29ed2cd31e4dbae0067e3e854340271 100644 (file)
--- a/arch/arm/mach-realview/realview_pbx.c
+++ b/arch/arm/mach-realview/realview_pbx.c
@@ -79,14 +79,6 @@ static struct map_desc realview_pbx_io_desc[] __initdata = {
                .length         = SZ_4K,
                .type           = MT_DEVICE,
        },
-#ifdef CONFIG_PCI
-       {
-               .virtual        = PCIX_UNIT_BASE,
-               .pfn            = __phys_to_pfn(REALVIEW_PBX_PCI_BASE),
-               .length         = REALVIEW_PBX_PCI_BASE_SIZE,
-               .type           = MT_DEVICE,
-       },
-#endif
 #ifdef CONFIG_DEBUG_LL
        {
                .virtual        = IO_ADDRESS(REALVIEW_PBX_UART0_BASE),