Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-2.6-block.git] / arch / arm / mach-sunxi / Kconfig

diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
index bce0d4277f71974ceefb7a2f9ec8e31ef75ceb9d..b9d6cad8669b8ea623aa5787de36c80d8caa5621 100644 (file)
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@ -1,7 +1,9 @@
 config ARCH_SUNXI
        bool "Allwinner A1X SOCs" if ARCH_MULTI_V7
+       select ARCH_HAS_RESET_CONTROLLER
        select ARCH_REQUIRE_GPIOLIB
        select ARM_GIC
+       select ARM_PSCI
        select CLKSRC_MMIO
        select CLKSRC_OF
        select COMMON_CLK
@@ -10,6 +12,7 @@ config ARCH_SUNXI
        select HAVE_SMP
        select PINCTRL
        select PINCTRL_SUNXI
+       select RESET_CONTROLLER
        select SPARSE_IRQ
        select SUN4I_TIMER
        select SUN5I_HSTIMER