From 44a6520118ffa4856ee41ef8da807a54febd11b6 Mon Sep 17 00:00:00 2001 From: luka Date: Tue, 10 Mar 2015 16:11:44 +0000 Subject: [PATCH] ar71xx: refresh patches Signed-off-by: Luka Perkov git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44649 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch | 6 +++--- .../patches-3.18/707-MIPS-ath79-add-support-for-QCA953x-SoC.patch | 4 ++-- .../patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch | 4 ++-- .../patches-3.18/736-MIPS-ath79-add-MC-MAC1200R-support.patch | 2 +- target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch | 2 +- 5 files changed, 9 insertions(+), 9 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 dfbc766c28..fa4074eb87 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 @@ -1273,7 +1273,7 @@ config ATH79_MACH_UBNT_XM bool "Ubiquiti Networks XM/UniFi boards" -@@ -83,6 +1056,97 @@ config ATH79_MACH_UBNT_XM +@@ -83,6 +1065,97 @@ config ATH79_MACH_UBNT_XM Say 'Y' here if you want your kernel to support the Ubiquiti Networks XM (rev 1.0) board. @@ -1371,7 +1371,7 @@ endmenu config SOC_AR71XX -@@ -124,7 +1188,10 @@ config ATH79_DEV_DSA +@@ -124,7 +1197,10 @@ config ATH79_DEV_DSA config ATH79_DEV_ETH def_bool n @@ -1383,7 +1383,7 @@ def_bool n config ATH79_DEV_GPIO_BUTTONS -@@ -156,4 +1223,7 @@ config ATH79_PCI_ATH9K_FIXUP +@@ -156,4 +1232,7 @@ config ATH79_PCI_ATH9K_FIXUP config ATH79_ROUTERBOOT def_bool n diff --git a/target/linux/ar71xx/patches-3.18/707-MIPS-ath79-add-support-for-QCA953x-SoC.patch b/target/linux/ar71xx/patches-3.18/707-MIPS-ath79-add-support-for-QCA953x-SoC.patch index ed06a9b33a..9b69869143 100644 --- a/target/linux/ar71xx/patches-3.18/707-MIPS-ath79-add-support-for-QCA953x-SoC.patch +++ b/target/linux/ar71xx/patches-3.18/707-MIPS-ath79-add-support-for-QCA953x-SoC.patch @@ -22,7 +22,7 @@ meaning of the bits CPUCLK_FROM_CPUPLL and DDRCLK_FROM_DDRPLL is reversed. --- a/arch/mips/ath79/Kconfig +++ b/arch/mips/ath79/Kconfig -@@ -1168,6 +1168,10 @@ config SOC_AR934X +@@ -1178,6 +1178,10 @@ config SOC_AR934X select PCI_AR724X if PCI def_bool n @@ -33,7 +33,7 @@ meaning of the bits CPUCLK_FROM_CPUPLL and DDRCLK_FROM_DDRPLL is reversed. config SOC_QCA955X select HW_HAS_PCI select PCI_AR724X if PCI -@@ -1210,7 +1214,7 @@ config ATH79_DEV_USB +@@ -1220,7 +1224,7 @@ config ATH79_DEV_USB def_bool n config ATH79_DEV_WMAC diff --git a/target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch b/target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch index 7e031b20e1..da5126aaaa 100644 --- a/target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch +++ b/target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch @@ -445,7 +445,7 @@ } --- a/arch/mips/ath79/Kconfig +++ b/arch/mips/ath79/Kconfig -@@ -1177,6 +1177,12 @@ config SOC_QCA955X +@@ -1187,6 +1187,12 @@ config SOC_QCA955X select PCI_AR724X if PCI def_bool n @@ -458,7 +458,7 @@ config ATH79_DEV_M25P80 select ATH79_DEV_SPI def_bool n -@@ -1214,7 +1220,7 @@ config ATH79_DEV_USB +@@ -1224,7 +1230,7 @@ config ATH79_DEV_USB def_bool n config ATH79_DEV_WMAC diff --git a/target/linux/ar71xx/patches-3.18/736-MIPS-ath79-add-MC-MAC1200R-support.patch b/target/linux/ar71xx/patches-3.18/736-MIPS-ath79-add-MC-MAC1200R-support.patch index 0e474e46a4..d38e82300f 100644 --- a/target/linux/ar71xx/patches-3.18/736-MIPS-ath79-add-MC-MAC1200R-support.patch +++ b/target/linux/ar71xx/patches-3.18/736-MIPS-ath79-add-MC-MAC1200R-support.patch @@ -1,6 +1,6 @@ --- a/arch/mips/ath79/Kconfig +++ b/arch/mips/ath79/Kconfig -@@ -514,6 +514,16 @@ config ATH79_MACH_R6100 +@@ -524,6 +524,16 @@ config ATH79_MACH_R6100 select ATH79_DEV_USB select ATH79_DEV_WMAC diff --git a/target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch index 45772b6159..5990f7073a 100644 --- a/target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch @@ -246,7 +246,7 @@ &sin->sin6_addr); sin->sin6_scope_id = 0; } -@@ -712,12 +712,12 @@ int ip6_datagram_send_ctl(struct net *ne +@@ -708,12 +708,12 @@ int ip6_datagram_send_ctl(struct net *ne } if (fl6->flowlabel&IPV6_FLOWINFO_MASK) { -- 2.11.0