diff options
author | Jonas Gorski <jogo@openwrt.org> | 2015-07-25 10:02:47 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2015-07-25 10:02:47 +0000 |
commit | c84640edc825e2fc2dd6c3a424506ad7cc7decf3 (patch) | |
tree | 5ba5097475bbc7830f2d561c66549203b25c57b7 /target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch | |
parent | c8ebf766becbfbf41c228379cb304658748c906d (diff) | |
download | upstream-c84640edc825e2fc2dd6c3a424506ad7cc7decf3.tar.gz upstream-c84640edc825e2fc2dd6c3a424506ad7cc7decf3.tar.bz2 upstream-c84640edc825e2fc2dd6c3a424506ad7cc7decf3.zip |
CC: kernel: update 3.18 to 3.18.19
Changelog:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.19
Backport of r46439.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46487 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch')
-rw-r--r-- | target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch index d50081a175..bac8f20202 100644 --- a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch +++ b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch @@ -1317,7 +1317,7 @@ config ATH79_MACH_UBNT_XM bool "Ubiquiti Networks XM/UniFi boards" -@@ -83,6 +1116,97 @@ config ATH79_MACH_UBNT_XM +@@ -83,6 +1105,97 @@ config ATH79_MACH_UBNT_XM Say 'Y' here if you want your kernel to support the Ubiquiti Networks XM (rev 1.0) board. @@ -1415,7 +1415,7 @@ endmenu config SOC_AR71XX -@@ -124,7 +1248,10 @@ config ATH79_DEV_DSA +@@ -124,7 +1237,10 @@ config ATH79_DEV_DSA config ATH79_DEV_ETH def_bool n @@ -1427,7 +1427,7 @@ def_bool n config ATH79_DEV_GPIO_BUTTONS -@@ -154,6 +1281,11 @@ config ATH79_PCI_ATH9K_FIXUP +@@ -154,6 +1270,11 @@ config ATH79_PCI_ATH9K_FIXUP def_bool n config ATH79_ROUTERBOOT |