diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-11-23 16:27:19 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-11-23 16:27:19 +0000 |
| commit | 4ac29a2396a2a0d75fb466b36ae74a8664795ed4 (patch) | |
| tree | 920bf0dc18fbfffdf46207bbfbd1e9ad0fc8b46a /target/linux/ar71xx/patches-3.14/709-MIPS-ath79-add-NBG6716.patch | |
| parent | e238d1b161efa171d4a8bc9abe79a413d15135ca (diff) | |
| download | upstream-4ac29a2396a2a0d75fb466b36ae74a8664795ed4.tar.gz upstream-4ac29a2396a2a0d75fb466b36ae74a8664795ed4.tar.bz2 upstream-4ac29a2396a2a0d75fb466b36ae74a8664795ed4.zip | |
ar71xx: merge changes from 3.10 that were forgotten for 3.14
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43347 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/patches-3.14/709-MIPS-ath79-add-NBG6716.patch')
| -rw-r--r-- | target/linux/ar71xx/patches-3.14/709-MIPS-ath79-add-NBG6716.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ar71xx/patches-3.14/709-MIPS-ath79-add-NBG6716.patch b/target/linux/ar71xx/patches-3.14/709-MIPS-ath79-add-NBG6716.patch index 8e1a94983c..70ec89d06f 100644 --- a/target/linux/ar71xx/patches-3.14/709-MIPS-ath79-add-NBG6716.patch +++ b/target/linux/ar71xx/patches-3.14/709-MIPS-ath79-add-NBG6716.patch @@ -1,6 +1,6 @@ --- a/arch/mips/ath79/Makefile +++ b/arch/mips/ath79/Makefile -@@ -130,3 +130,4 @@ obj-$(CONFIG_ATH79_MACH_WZR_HP_AG300H) + +@@ -131,3 +131,4 @@ obj-$(CONFIG_ATH79_MACH_WZR_HP_AG300H) + obj-$(CONFIG_ATH79_MACH_WZR_HP_G450H) += mach-wzr-hp-g450h.o obj-$(CONFIG_ATH79_MACH_ZCN_1523H) += mach-zcn-1523h.o obj-$(CONFIG_ATH79_MACH_CARAMBOLA2) += mach-carambola2.o @@ -17,7 +17,7 @@ ATH79_MACH_OM2P, /* OpenMesh OM2P */ --- a/arch/mips/ath79/Kconfig +++ b/arch/mips/ath79/Kconfig -@@ -899,6 +899,17 @@ config ATH79_MACH_NBG460N +@@ -909,6 +909,17 @@ config ATH79_MACH_NBG460N select ATH79_DEV_M25P80 select ATH79_DEV_WMAC |