diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-07-17 16:36:03 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-07-17 16:36:03 +0000 |
| commit | 579481b4f53be4c5b56729a7f9f9384632312708 (patch) | |
| tree | a59147d12f57fa9f085023a8ada164f07d678d76 /target/linux | |
| parent | 5e76534b237053ed2b2e24f1b4c0b50175406d5e (diff) | |
| download | upstream-579481b4f53be4c5b56729a7f9f9384632312708.tar.gz upstream-579481b4f53be4c5b56729a7f9f9384632312708.tar.bz2 upstream-579481b4f53be4c5b56729a7f9f9384632312708.zip | |
atheros[ar2315-wdt]: rename config symbol
Rename config symbol to AR2315_WDT to avoid confusion with other Atheros
SoCs.
Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
SVN-Revision: 41685
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/atheros/config-3.10 | 2 | ||||
| -rw-r--r-- | target/linux/atheros/patches-3.10/130-watchdog.patch | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/target/linux/atheros/config-3.10 b/target/linux/atheros/config-3.10 index e6ab73b393..ccbb592175 100644 --- a/target/linux/atheros/config-3.10 +++ b/target/linux/atheros/config-3.10 @@ -12,7 +12,7 @@ CONFIG_ATHEROS_AR2315=y CONFIG_ATHEROS_AR2315_PCI=y CONFIG_ATHEROS_AR231X=y CONFIG_ATHEROS_AR5312=y -CONFIG_ATHEROS_WDT=y +CONFIG_AR2315_WDT=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_CEVT_R4K=y CONFIG_CLONE_BACKWARDS=y diff --git a/target/linux/atheros/patches-3.10/130-watchdog.patch b/target/linux/atheros/patches-3.10/130-watchdog.patch index 5dd0e75842..b0284e738d 100644 --- a/target/linux/atheros/patches-3.10/130-watchdog.patch +++ b/target/linux/atheros/patches-3.10/130-watchdog.patch @@ -192,15 +192,16 @@ +MODULE_ALIAS("platform:" DRIVER_NAME); --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig -@@ -1113,6 +1113,12 @@ config LANTIQ_WDT +@@ -1113,6 +1113,13 @@ config LANTIQ_WDT help Hardware driver for the Lantiq SoC Watchdog Timer. -+config ATHEROS_WDT -+ tristate "Atheros wisoc Watchdog Timer" ++config AR2315_WDT ++ tristate "Atheros AR2315+ WiSoCs Watchdog Timer" + depends on ATHEROS_AR231X + help -+ Hardware driver for the Atheros wisoc Watchdog Timer. ++ Hardware driver for the built-in watchdog timer on the Atheros ++ AR2315/AR2316 WiSoCs. + # PARISC Architecture @@ -211,7 +212,7 @@ obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt.o obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o obj-$(CONFIG_AR7_WDT) += ar7_wdt.o -+obj-$(CONFIG_ATHEROS_WDT) += ar2315-wtd.o ++obj-$(CONFIG_AR2315_WDT) += ar2315-wtd.o obj-$(CONFIG_TXX9_WDT) += txx9wdt.o obj-$(CONFIG_OCTEON_WDT) += octeon-wdt.o octeon-wdt-y := octeon-wdt-main.o octeon-wdt-nmi.o |