aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/atheros/patches-3.18/105-ar2315_pci.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-03-13 03:01:37 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-03-13 03:01:37 +0000
commit6d29a8bc64830d3f0c26eafe47880f84aeb425e8 (patch)
treea7b4ecd4822e95403bb988874fbcbfeb16f28aa8 /target/linux/atheros/patches-3.18/105-ar2315_pci.patch
parenteb370470d8928c910ce75a23bc67b22d8a4e2883 (diff)
downloadupstream-6d29a8bc64830d3f0c26eafe47880f84aeb425e8.tar.gz
upstream-6d29a8bc64830d3f0c26eafe47880f84aeb425e8.tar.bz2
upstream-6d29a8bc64830d3f0c26eafe47880f84aeb425e8.zip
atheros: v3.18: move GPIO patches behind PCI
Move GPIO patches behind PCI patch, since they are not yet merged upstream. Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com> SVN-Revision: 44728
Diffstat (limited to 'target/linux/atheros/patches-3.18/105-ar2315_pci.patch')
-rw-r--r--target/linux/atheros/patches-3.18/105-ar2315_pci.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/atheros/patches-3.18/105-ar2315_pci.patch b/target/linux/atheros/patches-3.18/105-ar2315_pci.patch
index 4de4f3ab8b..8e3dfa1349 100644
--- a/target/linux/atheros/patches-3.18/105-ar2315_pci.patch
+++ b/target/linux/atheros/patches-3.18/105-ar2315_pci.patch
@@ -524,9 +524,9 @@
+}
--- a/arch/mips/ath25/Kconfig
+++ b/arch/mips/ath25/Kconfig
-@@ -9,3 +9,10 @@ config SOC_AR2315
+@@ -7,3 +7,10 @@ config SOC_AR2315
+ bool "Atheros 2315+ support"
depends on ATH25
- select GPIO_AR2315
default y
+
+config PCI_AR2315
@@ -548,7 +548,7 @@
else if (pending & CAUSEF_IP2)
do_IRQ(AR2315_IRQ_MISC);
else if (pending & CAUSEF_IP7)
-@@ -460,10 +464,62 @@ void __init ar2315_plat_mem_setup(void)
+@@ -429,10 +433,62 @@ void __init ar2315_plat_mem_setup(void)
_machine_restart = ar2315_restart;
}