aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/ath79/Kconfig4
-rw-r--r--arch/mips/include/asm/mach-ath79/pci.h2
-rw-r--r--arch/mips/pci/Makefile2
3 files changed, 6 insertions, 2 deletions
diff --git a/arch/mips/ath79/Kconfig b/arch/mips/ath79/Kconfig
index 5fa3d7b2b716..123cc3773b49 100644
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
@@ -59,6 +59,7 @@ config SOC_AR724X
59 select USB_ARCH_HAS_EHCI 59 select USB_ARCH_HAS_EHCI
60 select USB_ARCH_HAS_OHCI 60 select USB_ARCH_HAS_OHCI
61 select HW_HAS_PCI 61 select HW_HAS_PCI
62 select PCI_AR724X if PCI
62 def_bool n 63 def_bool n
63 64
64config SOC_AR913X 65config SOC_AR913X
@@ -73,6 +74,9 @@ config SOC_AR934X
73 select USB_ARCH_HAS_EHCI 74 select USB_ARCH_HAS_EHCI
74 def_bool n 75 def_bool n
75 76
77config PCI_AR724X
78 def_bool n
79
76config ATH79_DEV_GPIO_BUTTONS 80config ATH79_DEV_GPIO_BUTTONS
77 def_bool n 81 def_bool n
78 82
diff --git a/arch/mips/include/asm/mach-ath79/pci.h b/arch/mips/include/asm/mach-ath79/pci.h
index 4f2222de6064..7868f7fa028f 100644
--- a/arch/mips/include/asm/mach-ath79/pci.h
+++ b/arch/mips/include/asm/mach-ath79/pci.h
@@ -19,7 +19,7 @@ int ar71xx_pcibios_init(void);
19static inline int ar71xx_pcibios_init(void) { return 0; } 19static inline int ar71xx_pcibios_init(void) { return 0; }
20#endif 20#endif
21 21
22#if defined(CONFIG_PCI) && defined(CONFIG_SOC_AR724X) 22#if defined(CONFIG_PCI_AR724X)
23int ar724x_pcibios_init(int irq); 23int ar724x_pcibios_init(int irq);
24#else 24#else
25static inline int ar724x_pcibios_init(int irq) { return 0; } 25static inline int ar724x_pcibios_init(int irq) { return 0; }
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile
index b1c0a1c88991..43c5138a8498 100644
--- a/arch/mips/pci/Makefile
+++ b/arch/mips/pci/Makefile
@@ -20,7 +20,7 @@ obj-$(CONFIG_BCM63XX) += pci-bcm63xx.o fixup-bcm63xx.o \
20 ops-bcm63xx.o 20 ops-bcm63xx.o
21obj-$(CONFIG_MIPS_ALCHEMY) += pci-alchemy.o 21obj-$(CONFIG_MIPS_ALCHEMY) += pci-alchemy.o
22obj-$(CONFIG_SOC_AR71XX) += pci-ar71xx.o 22obj-$(CONFIG_SOC_AR71XX) += pci-ar71xx.o
23obj-$(CONFIG_SOC_AR724X) += pci-ar724x.o 23obj-$(CONFIG_PCI_AR724X) += pci-ar724x.o
24 24
25# 25#
26# These are still pretty much in the old state, watch, go blind. 26# These are still pretty much in the old state, watch, go blind.