aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-01-23 08:52:21 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-01-23 08:52:21 +0000
commit44517a3789318bc8ec874dac49de1834b97d8992 (patch)
tree904690ea06dc646ec8292942189d7036b385f822 /target/linux/ar71xx
parent778db0a13da39cc273dae200b61c6041ee1fd0a3 (diff)
downloadupstream-44517a3789318bc8ec874dac49de1834b97d8992.tar.gz
upstream-44517a3789318bc8ec874dac49de1834b97d8992.tar.bz2
upstream-44517a3789318bc8ec874dac49de1834b97d8992.zip
ar71xx: 3.2: fix build errors if PCI is not enabled
SVN-Revision: 29870
Diffstat (limited to 'target/linux/ar71xx')
-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 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 */