From: Gabor Juhos <juhosg@openwrt.org>
Date: Mon, 23 Jan 2012 08:52:21 +0000 (+0000)
Subject: ar71xx: 3.2: fix build errors if PCI is not enabled
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=44517a3789318bc8ec874dac49de1834b97d8992;p=openwrt%2Fstaging%2Fneocturne.git

ar71xx: 3.2: fix build errors if PCI is not enabled

SVN-Revision: 29870
---

diff --git a/target/linux/ar71xx/files-3.2/arch/mips/ath79/mach-eap7660d.c b/target/linux/ar71xx/files-3.2/arch/mips/ath79/mach-eap7660d.c
index c2c85f2e34..cbd201994d 100644
--- a/target/linux/ar71xx/files-3.2/arch/mips/ath79/mach-eap7660d.c
+++ b/target/linux/ar71xx/files-3.2/arch/mips/ath79/mach-eap7660d.c
@@ -41,6 +41,7 @@
 #define EAP7660D_WMAC0_CALDATA_OFFSET	0x2000
 #define EAP7660D_WMAC1_CALDATA_OFFSET	0x3000
 
+#ifdef CONFIG_PCI
 static struct ath5k_platform_data eap7660d_wmac0_data;
 static struct ath5k_platform_data eap7660d_wmac1_data;
 static char eap7660d_wmac0_mac[6];
@@ -48,7 +49,6 @@ static char eap7660d_wmac1_mac[6];
 static u16 eap7660d_wmac0_eeprom[ATH5K_PLAT_EEP_MAX_WORDS];
 static u16 eap7660d_wmac1_eeprom[ATH5K_PLAT_EEP_MAX_WORDS];
 
-#ifdef CONFIG_PCI
 static int eap7660d_pci_plat_dev_init(struct pci_dev *dev)
 {
 	switch (PCI_SLOT(dev->devfn)) {
diff --git a/target/linux/ar71xx/patches-3.2/212-MIPS-ath79-fix-build-error-if-PCI-not-enabled.patch b/target/linux/ar71xx/patches-3.2/212-MIPS-ath79-fix-build-error-if-PCI-not-enabled.patch
new file mode 100644
index 0000000000..3a5ebab922
--- /dev/null
+++ b/target/linux/ar71xx/patches-3.2/212-MIPS-ath79-fix-build-error-if-PCI-not-enabled.patch
@@ -0,0 +1,18 @@
+--- a/arch/mips/include/asm/mach-ath79/pci.h
++++ b/arch/mips/include/asm/mach-ath79/pci.h
+@@ -16,13 +16,13 @@
+ #if defined(CONFIG_PCI) && defined(CONFIG_SOC_AR71XX)
+ int ar71xx_pcibios_init(void);
+ #else
+-static inline int ar71xx_pcibios_init(void) { return 0 };
++static inline int ar71xx_pcibios_init(void) { return 0; };
+ #endif
+ 
+ #if defined(CONFIG_PCI_AR724X)
+ int ar724x_pcibios_init(int irq);
+ #else
+-static inline int ar724x_pcibios_init(int irq) { return 0 };
++static inline int ar724x_pcibios_init(int irq) { return 0; };
+ #endif
+ 
+ #endif /* __ASM_MACH_ATH79_PCI_H */