Merge branch 'akpm' (patches from Andrew)

[cascardo/linux.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c297bc5..b5d529f 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -278,10 +278,9 @@ config PHYS_OFFSET
                        ARCH_INTEGRATOR || \
                        ARCH_IOP13XX || \
                        ARCH_KS8695 || \
-                       (ARCH_REALVIEW && !REALVIEW_HIGH_PHYS_OFFSET)
+                       ARCH_REALVIEW
        default 0x10000000 if ARCH_OMAP1 || ARCH_RPC
        default 0x20000000 if ARCH_S5PV210
-       default 0x70000000 if REALVIEW_HIGH_PHYS_OFFSET
        default 0xc0000000 if ARCH_SA1100
        help
          Please provide the physical address corresponding to the
@@ -337,6 +336,7 @@ config ARCH_MULTIPLATFORM
        select GENERIC_CLOCKEVENTS
        select MIGHT_HAVE_PCI
        select MULTI_IRQ_HANDLER
+       select PCI_DOMAINS if PCI
        select SPARSE_IRQ
        select USE_OF