summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-01-23 08:52:21 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-01-23 08:52:21 +0000
commit71feb1ed023d103a41f3aac0cf4ca1f7ddd99229 (patch)
tree13dfa45bce37eb5b52bb31123f9d683c0bf4985d /target
parentbe456a123482650da2db0a149c456cfc4961aa37 (diff)
ar71xx: 3.2: fix build errors if PCI is not enabled
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29870 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/ar71xx/files-3.2/arch/mips/ath79/mach-eap7660d.c2
-rw-r--r--target/linux/ar71xx/patches-3.2/212-MIPS-ath79-fix-build-error-if-PCI-not-enabled.patch18
2 files changed, 19 insertions, 1 deletions
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 c2c85f2e3..cbd201994 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 000000000..3a5ebab92
--- /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 */