diff options
| author | Timo Sigurdsson <public_timo.s@silentcreek.de> | 2015-04-06 16:57:22 -0400 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2015-07-05 10:33:56 -0400 |
| commit | 07d1f344159764bcd4e228e4a65e804dfe59dfe9 (patch) | |
| tree | 0834d0b762eabfe34d5e1476a6b009044469097d | |
| parent | 159870d2413c92622790e9cecbce95099bed539a (diff) | |
ARM: Remove deprecated symbol from defconfig files
Commit b2b3a8b934e6 ("power/reset: Remove sun6i reboot driver") removed
the sun6i reboot driver. But sunxi_defconfig and multi_v7_defconfig
still contain the symbol CONFIG_POWER_RESET_SUN6I that was deprecated
by that commit, so remove it.
Signed-off-by: Timo Sigurdsson <public_timo.s@silentcreek.de>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/sunxi_defconfig | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index ab86655c1f4b..22df0021d265 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig | |||
| @@ -319,7 +319,6 @@ CONFIG_POWER_RESET_AS3722=y | |||
| 319 | CONFIG_POWER_RESET_GPIO=y | 319 | CONFIG_POWER_RESET_GPIO=y |
| 320 | CONFIG_POWER_RESET_GPIO_RESTART=y | 320 | CONFIG_POWER_RESET_GPIO_RESTART=y |
| 321 | CONFIG_POWER_RESET_KEYSTONE=y | 321 | CONFIG_POWER_RESET_KEYSTONE=y |
| 322 | CONFIG_POWER_RESET_SUN6I=y | ||
| 323 | CONFIG_POWER_RESET_RMOBILE=y | 322 | CONFIG_POWER_RESET_RMOBILE=y |
| 324 | CONFIG_SENSORS_LM90=y | 323 | CONFIG_SENSORS_LM90=y |
| 325 | CONFIG_SENSORS_LM95245=y | 324 | CONFIG_SENSORS_LM95245=y |
diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig index 8ecba00dcd83..2c7af0a57cb1 100644 --- a/arch/arm/configs/sunxi_defconfig +++ b/arch/arm/configs/sunxi_defconfig | |||
| @@ -77,7 +77,6 @@ CONFIG_SPI_SUN6I=y | |||
| 77 | CONFIG_GPIO_SYSFS=y | 77 | CONFIG_GPIO_SYSFS=y |
| 78 | CONFIG_POWER_SUPPLY=y | 78 | CONFIG_POWER_SUPPLY=y |
| 79 | CONFIG_POWER_RESET=y | 79 | CONFIG_POWER_RESET=y |
| 80 | CONFIG_POWER_RESET_SUN6I=y | ||
| 81 | CONFIG_THERMAL=y | 80 | CONFIG_THERMAL=y |
| 82 | CONFIG_CPU_THERMAL=y | 81 | CONFIG_CPU_THERMAL=y |
| 83 | CONFIG_WATCHDOG=y | 82 | CONFIG_WATCHDOG=y |
