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/725-MIPS-ath79-add_mikrotik_rb2011uias-2hnd.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/725-MIPS-ath79-add_mikrotik_rb2011uias-2hnd.patch')
-rw-r--r-- | target/linux/ar71xx/patches-3.14/725-MIPS-ath79-add_mikrotik_rb2011uias-2hnd.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/target/linux/ar71xx/patches-3.14/725-MIPS-ath79-add_mikrotik_rb2011uias-2hnd.patch b/target/linux/ar71xx/patches-3.14/725-MIPS-ath79-add_mikrotik_rb2011uias-2hnd.patch new file mode 100644 index 0000000000..f49d713ad4 --- /dev/null +++ b/target/linux/ar71xx/patches-3.14/725-MIPS-ath79-add_mikrotik_rb2011uias-2hnd.patch @@ -0,0 +1,22 @@ +--- a/arch/mips/ath79/mach-rb2011.c ++++ b/arch/mips/ath79/mach-rb2011.c +@@ -323,7 +323,7 @@ MIPS_MACHINE_NONAME(ATH79_MACH_RB_2011US + + static void __init rb2011r5_setup(void) + { +- rb2011_setup(RB2011_FLAG_SFP | RB2011_FLAG_USB); ++ rb2011_setup(RB2011_FLAG_SFP | RB2011_FLAG_USB | RB2011_FLAG_WLAN); + } + + MIPS_MACHINE_NONAME(ATH79_MACH_RB_2011R5, "2011r5", rb2011r5_setup); +--- a/arch/mips/ath79/machtypes.h ++++ b/arch/mips/ath79/machtypes.h +@@ -99,7 +99,7 @@ enum ath79_mach_type { + ATH79_MACH_RB_2011G, /* Mikrotik RouterBOARD 2011UAS-2HnD */ + ATH79_MACH_RB_2011L, /* Mikrotik RouterBOARD 2011L */ + ATH79_MACH_RB_2011US, /* Mikrotik RouterBOARD 2011UAS */ +- ATH79_MACH_RB_2011R5, /* Mikrotik RouterBOARD 2011UiAS */ ++ ATH79_MACH_RB_2011R5, /* Mikrotik RouterBOARD 2011UiAS(-2Hnd) */ + ATH79_MACH_RB_SXTLITE2ND, /* Mikrotik RouterBOARD SXT Lite 2nD */ + ATH79_MACH_RB_SXTLITE5ND, /* Mikrotik RouterBOARD SXT Lite 5nD */ + ATH79_MACH_RW2458N, /* Redwave RW2458N */ |