Author: nbd Date: 2014-07-17 18:36:03 +0200 (Thu, 17 Jul 2014) New Revision: 41685
Modified: trunk/target/linux/atheros/config-3.10 trunk/target/linux/atheros/patches-3.10/130-watchdog.patch Log: atheros[ar2315-wdt]: rename config symbol Rename config symbol to AR2315_WDT to avoid confusion with other Atheros SoCs. Signed-off-by: Sergey Ryazanov <[email protected]> Modified: trunk/target/linux/atheros/config-3.10 =================================================================== --- trunk/target/linux/atheros/config-3.10 2014-07-17 16:35:59 UTC (rev 41684) +++ trunk/target/linux/atheros/config-3.10 2014-07-17 16:36:03 UTC (rev 41685) @@ -12,7 +12,7 @@ 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 Modified: trunk/target/linux/atheros/patches-3.10/130-watchdog.patch =================================================================== --- trunk/target/linux/atheros/patches-3.10/130-watchdog.patch 2014-07-17 16:35:59 UTC (rev 41684) +++ trunk/target/linux/atheros/patches-3.10/130-watchdog.patch 2014-07-17 16:36:03 UTC (rev 41685) @@ -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 _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
