Changeset 26606

Timestamp:

2011-04-12T15:14:56+02:00 (7 years ago)

Author:

juhosg

Message:

ar71xx: fix build error w/o CONFIG_PCI

Location:

trunk/target/linux/ar71xx/files/arch/mips

Files:

• ar71xx/dev-ap91-pci.h (modified) (1 diff)
• ar71xx/mach-eap7660d.c (modified) (2 diffs)
• include/asm/mach-ar71xx/pci.h (modified) (2 diffs)

trunk/target/linux/ar71xx/files/arch/mips/ar71xx/dev-ap91-pci.h

@@ -18 +18 @@
 #else
 static inline void ap91_pci_init(u8 *cal_data, u8 *mac_addr) { }
-static inline void ap91_pci_setup_wmac_led(int pin) { }
+static inline void ap91_pci_setup_wmac_led_pin(int pin) { }
 static inline void ap91_pci_setup_wmac_gpio(u32 mask, u32 gpio) { }
 #endif

trunk/target/linux/ar71xx/files/arch/mips/ar71xx/mach-eap7660d.c

@@ -47 +47 @@
 static u16 eap7660d_wmac1_eeprom[ATH5K_PLAT_EEP_MAX_WORDS];
 
+#ifdef CONFIG_PCI
 static struct ar71xx_pci_irq eap7660d_pci_irqs[] __initdata = {
         {
@@ -104 +105 @@
         ar71xx_pci_init(ARRAY_SIZE(eap7660d_pci_irqs), eap7660d_pci_irqs);
 }
+#else
+static inline void eap7660d_pci_init(u8 *cal_data0, u8 *mac_addr0,
+                                     u8 *cal_data1, u8 *mac_addr1)
+{
+}
+#endif /* CONFIG_PCI */
 
 static struct gpio_led eap7660d_leds_gpio[] __initdata = {

trunk/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/pci.h

@@ -21 +21 @@
 };
 
+#ifdef CONFIG_PCI
 extern int (*ar71xx_pci_plat_dev_init)(struct pci_dev *dev);
 extern unsigned ar71xx_pci_nr_irqs __initdata;
@@ -36 +37 @@
 
 int ar71xx_pci_init(unsigned nr_irqs, struct ar71xx_pci_irq *map) __init;
+#else
+static inline int ar71xx_pci_init(unsigned nr_irqs, struct ar71xx_pci_irq *map)
+{
+        return 0;
+}
+#endif
 
 #endif /* __ASM_MACH_AR71XX_PCI_H */