Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / drivers / power / reset / Kconfig

diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig
index 0498363..513efe8 100644 (file)
--- a/drivers/power/reset/Kconfig
+++ b/drivers/power/reset/Kconfig
@@ -26,7 +26,7 @@ config POWER_RESET_AT91_POWEROFF
 config POWER_RESET_AT91_RESET
        tristate "Atmel AT91 reset driver"
        depends on ARCH_AT91
-       default SOC_AT91SAM9 || SOC_SAMA5
+       default SOC_AT91SAM9 || SOC_SAM9X60 || SOC_SAMA5
        help
          This driver supports restart for Atmel AT91SAM9 and SAMA5
          SoCs
@@ -34,7 +34,7 @@ config POWER_RESET_AT91_RESET
 config POWER_RESET_AT91_SAMA5D2_SHDWC
        tristate "Atmel AT91 SAMA5D2-Compatible shutdown controller driver"
        depends on ARCH_AT91
-       default SOC_SAMA5
+       default SOC_SAM9X60 || SOC_SAMA5
        help
          This driver supports the alternate shutdown controller for some Atmel
          SAMA5 SoCs. It is present for example on SAMA5D2 SoC.