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 | 174d16e59f654e24bf8554c6506512fc1ad1d7db (patch) | |
| tree | bf2e5705fc6c7e808334321bce66e5a4ac33a0b2 /target/linux/ar71xx/patches-3.14/730-MIPS-ath79-add-mr900-support.patch | |
| parent | 185172bdd37facc5337c0fc8fd7b2c86bad9cecf (diff) | |
| download | upstream-174d16e59f654e24bf8554c6506512fc1ad1d7db.tar.gz upstream-174d16e59f654e24bf8554c6506512fc1ad1d7db.tar.bz2 upstream-174d16e59f654e24bf8554c6506512fc1ad1d7db.zip | |
ar71xx: merge changes from 3.10 that were forgotten for 3.14
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 43347
Diffstat (limited to 'target/linux/ar71xx/patches-3.14/730-MIPS-ath79-add-mr900-support.patch')
| -rw-r--r-- | target/linux/ar71xx/patches-3.14/730-MIPS-ath79-add-mr900-support.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ar71xx/patches-3.14/730-MIPS-ath79-add-mr900-support.patch b/target/linux/ar71xx/patches-3.14/730-MIPS-ath79-add-mr900-support.patch index deb6e56aa9..240a020d3a 100644 --- a/target/linux/ar71xx/patches-3.14/730-MIPS-ath79-add-mr900-support.patch +++ b/target/linux/ar71xx/patches-3.14/730-MIPS-ath79-add-mr900-support.patch @@ -1,6 +1,6 @@ --- a/arch/mips/ath79/Kconfig +++ b/arch/mips/ath79/Kconfig -@@ -654,6 +654,16 @@ config ATH79_MACH_CAP4200AG +@@ -685,6 +685,16 @@ config ATH79_MACH_CAP4200AG select ATH79_DEV_M25P80 select ATH79_DEV_WMAC @@ -19,7 +19,7 @@ select SOC_AR71XX --- a/arch/mips/ath79/Makefile +++ b/arch/mips/ath79/Makefile -@@ -74,6 +74,7 @@ obj-$(CONFIG_ATH79_MACH_JA76PF) += mach +@@ -75,6 +75,7 @@ obj-$(CONFIG_ATH79_MACH_JA76PF) += mach obj-$(CONFIG_ATH79_MACH_JWAP003) += mach-jwap003.o obj-$(CONFIG_ATH79_MACH_HORNET_UB) += mach-hornet-ub.o obj-$(CONFIG_ATH79_MACH_MR600) += mach-mr600.o @@ -29,7 +29,7 @@ obj-$(CONFIG_ATH79_MACH_MYNET_REXT) += mach-mynet-rext.o --- a/arch/mips/ath79/machtypes.h +++ b/arch/mips/ath79/machtypes.h -@@ -65,6 +65,7 @@ enum ath79_mach_type { +@@ -66,6 +66,7 @@ enum ath79_mach_type { ATH79_MACH_HORNET_UB, /* ALFA Networks Hornet-UB */ ATH79_MACH_MR600V2, /* OpenMesh MR600v2 */ ATH79_MACH_MR600, /* OpenMesh MR600 */ |