From b97f6c10b279e18681aa5a40cb961f009082b576 Mon Sep 17 00:00:00 2001
From: Gabor Juhos <juhosg@openwrt.org>
Date: Wed, 14 Mar 2012 10:45:29 +0100
Subject: [PATCH] --- yaml --- r: 309061 b: refs/heads/master c:
 67644c547fef2739f49c80e5eb1ace82f3e916e2 h: refs/heads/master i:   309059:
 a5567b471f01d637aa05a2f7f58faef667c579ea v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/mips/ath79/Kconfig                | 4 ++++
 trunk/arch/mips/include/asm/mach-ath79/pci.h | 2 +-
 trunk/arch/mips/pci/Makefile                 | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6b29386df956..56d37e81ecd9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 574d6e70ea25a8d5dd4b77464ae7314d40f1caf2
+refs/heads/master: 67644c547fef2739f49c80e5eb1ace82f3e916e2
diff --git a/trunk/arch/mips/ath79/Kconfig b/trunk/arch/mips/ath79/Kconfig
index 5fa3d7b2b716..123cc3773b49 100644
--- a/trunk/arch/mips/ath79/Kconfig
+++ b/trunk/arch/mips/ath79/Kconfig
@@ -59,6 +59,7 @@ config SOC_AR724X
 	select USB_ARCH_HAS_EHCI
 	select USB_ARCH_HAS_OHCI
 	select HW_HAS_PCI
+	select PCI_AR724X if PCI
 	def_bool n
 
 config SOC_AR913X
@@ -73,6 +74,9 @@ config SOC_AR934X
 	select USB_ARCH_HAS_EHCI
 	def_bool n
 
+config PCI_AR724X
+	def_bool n
+
 config ATH79_DEV_GPIO_BUTTONS
 	def_bool n
 
diff --git a/trunk/arch/mips/include/asm/mach-ath79/pci.h b/trunk/arch/mips/include/asm/mach-ath79/pci.h
index 4f2222de6064..7868f7fa028f 100644
--- a/trunk/arch/mips/include/asm/mach-ath79/pci.h
+++ b/trunk/arch/mips/include/asm/mach-ath79/pci.h
@@ -19,7 +19,7 @@ int ar71xx_pcibios_init(void);
 static inline int ar71xx_pcibios_init(void) { return 0; }
 #endif
 
-#if defined(CONFIG_PCI) && defined(CONFIG_SOC_AR724X)
+#if defined(CONFIG_PCI_AR724X)
 int ar724x_pcibios_init(int irq);
 #else
 static inline int ar724x_pcibios_init(int irq) { return 0; }
diff --git a/trunk/arch/mips/pci/Makefile b/trunk/arch/mips/pci/Makefile
index b1c0a1c88991..43c5138a8498 100644
--- a/trunk/arch/mips/pci/Makefile
+++ b/trunk/arch/mips/pci/Makefile
@@ -20,7 +20,7 @@ obj-$(CONFIG_BCM63XX)		+= pci-bcm63xx.o fixup-bcm63xx.o \
 					ops-bcm63xx.o
 obj-$(CONFIG_MIPS_ALCHEMY)	+= pci-alchemy.o
 obj-$(CONFIG_SOC_AR71XX)	+= pci-ar71xx.o
-obj-$(CONFIG_SOC_AR724X)	+= pci-ar724x.o
+obj-$(CONFIG_PCI_AR724X)	+= pci-ar724x.o
 
 #
 # These are still pretty much in the old state, watch, go blind.