diff options
author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-11-03 10:59:24 -0500 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-11-16 09:53:03 -0500 |
commit | f14882945d797d81d1f39207ae8e103eaf61b857 (patch) | |
tree | bc49f78102905d1f0d633e73f103b4d12c987368 | |
parent | 8005c49d9aea74d382f474ce11afbbc7d7130bec (diff) |
ARM: at91/defconfig: remove CONFIG_SSB from Atmel defconfigs
This "Sonics Silicon Backplane" support is not needed on Atmel SoCs: remove it.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
-rw-r--r-- | arch/arm/configs/at91_dt_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/configs/sama5_defconfig | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/configs/at91_dt_defconfig b/arch/arm/configs/at91_dt_defconfig index 1b1e5acd76e2..e4b1be66b3f5 100644 --- a/arch/arm/configs/at91_dt_defconfig +++ b/arch/arm/configs/at91_dt_defconfig | |||
@@ -125,7 +125,6 @@ CONFIG_POWER_RESET=y | |||
125 | # CONFIG_HWMON is not set | 125 | # CONFIG_HWMON is not set |
126 | CONFIG_WATCHDOG=y | 126 | CONFIG_WATCHDOG=y |
127 | CONFIG_AT91SAM9X_WATCHDOG=y | 127 | CONFIG_AT91SAM9X_WATCHDOG=y |
128 | CONFIG_SSB=m | ||
129 | CONFIG_MFD_ATMEL_HLCDC=y | 128 | CONFIG_MFD_ATMEL_HLCDC=y |
130 | CONFIG_REGULATOR=y | 129 | CONFIG_REGULATOR=y |
131 | CONFIG_REGULATOR_FIXED_VOLTAGE=y | 130 | CONFIG_REGULATOR_FIXED_VOLTAGE=y |
diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig index a0c57ac88b27..63f7e6ce649a 100644 --- a/arch/arm/configs/sama5_defconfig +++ b/arch/arm/configs/sama5_defconfig | |||
@@ -129,7 +129,6 @@ CONFIG_GPIO_SYSFS=y | |||
129 | CONFIG_POWER_SUPPLY=y | 129 | CONFIG_POWER_SUPPLY=y |
130 | CONFIG_POWER_RESET=y | 130 | CONFIG_POWER_RESET=y |
131 | # CONFIG_HWMON is not set | 131 | # CONFIG_HWMON is not set |
132 | CONFIG_SSB=m | ||
133 | CONFIG_MFD_ATMEL_FLEXCOM=y | 132 | CONFIG_MFD_ATMEL_FLEXCOM=y |
134 | CONFIG_REGULATOR=y | 133 | CONFIG_REGULATOR=y |
135 | CONFIG_REGULATOR_FIXED_VOLTAGE=y | 134 | CONFIG_REGULATOR_FIXED_VOLTAGE=y |