summaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-02-10 08:19:25 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-02-10 08:19:25 +0000
commitabeab97efc267a2855a6b5afb9d0c86c192900a0 (patch)
treec7b628639d36a879a716bf9f012a8d2548277c49 /target/linux/ar71xx
parent69593176911e2ca512d526c91300df1fd2b42bc0 (diff)
downloadmaster-31e0f0ae-abeab97efc267a2855a6b5afb9d0c86c192900a0.tar.gz
master-31e0f0ae-abeab97efc267a2855a6b5afb9d0c86c192900a0.tar.bz2
master-31e0f0ae-abeab97efc267a2855a6b5afb9d0c86c192900a0.zip
ar71xx: refresh 3.2 patches
SVN-Revision: 30402
Diffstat (limited to 'target/linux/ar71xx')
-rw-r--r--target/linux/ar71xx/patches-3.2/610-MIPS-ath79-openwrt-machines.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ar71xx/patches-3.2/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.2/610-MIPS-ath79-openwrt-machines.patch
index 048c7632fc..425b698be7 100644
--- a/target/linux/ar71xx/patches-3.2/610-MIPS-ath79-openwrt-machines.patch
+++ b/target/linux/ar71xx/patches-3.2/610-MIPS-ath79-openwrt-machines.patch
@@ -558,7 +558,7 @@
config ATH79_MACH_UBNT_XM
bool "Ubiquiti Networks XM (rev 1.0) board"
select SOC_AR724X
-@@ -67,6 +523,24 @@ config ATH79_MACH_UBNT_XM
+@@ -67,6 +513,24 @@ config ATH79_MACH_UBNT_XM
Say 'Y' here if you want your kernel to support the
Ubiquiti Networks XM (rev 1.0) board.
@@ -583,7 +583,7 @@
endmenu
config SOC_AR71XX
-@@ -96,10 +570,6 @@ config SOC_AR934X
+@@ -96,10 +560,6 @@ config SOC_AR934X
select PCI_AR724X if PCI
def_bool n
@@ -594,7 +594,7 @@
config ATH79_DEV_AP9X_PCI
select ATH79_PCI_ATH9K_FIXUP
def_bool n
-@@ -110,7 +580,14 @@ config ATH79_DEV_DSA
+@@ -110,7 +570,14 @@ config ATH79_DEV_DSA
config ATH79_DEV_ETH
def_bool n
@@ -610,7 +610,7 @@
def_bool n
config ATH79_DEV_GPIO_BUTTONS
-@@ -135,4 +612,7 @@ config ATH79_NVRAM
+@@ -135,4 +602,7 @@ config ATH79_NVRAM
config ATH79_PCI_ATH9K_FIXUP
def_bool n