diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-04-12 13:14:56 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-04-12 13:14:56 +0000 |
| commit | b5cfb56ed4783cd39a3966d6e12c7cbe4cfc9de4 (patch) | |
| tree | cbcea420cef821d48baf8ba4fa169a17ee756712 /target | |
| parent | 73318c10139668043e5a59d4bf182e737d04669a (diff) | |
ar71xx: fix build error w/o CONFIG_PCI
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26606 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
3 files changed, 15 insertions, 1 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/dev-ap91-pci.h b/target/linux/ar71xx/files/arch/mips/ar71xx/dev-ap91-pci.h index f5beb2ba0..e471083de 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/dev-ap91-pci.h +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/dev-ap91-pci.h @@ -17,7 +17,7 @@ void ap91_pci_setup_wmac_led_pin(int pin) __init; void ap91_pci_setup_wmac_gpio(u32 mask, u32 val) __init; #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 diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-eap7660d.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-eap7660d.c index d960d0cd4..69e22f39a 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-eap7660d.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-eap7660d.c @@ -46,6 +46,7 @@ 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 struct ar71xx_pci_irq eap7660d_pci_irqs[] __initdata = { { .slot = 0, @@ -103,6 +104,12 @@ void __init eap7660d_pci_init(u8 *cal_data0, u8 *mac_addr0, ar71xx_pci_plat_dev_init = eap7660d_pci_plat_dev_init; 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 = { { diff --git a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/pci.h b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/pci.h index c5352ce57..7a4b1145f 100644 --- a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/pci.h +++ b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/pci.h @@ -20,6 +20,7 @@ struct ar71xx_pci_irq { u8 pin; }; +#ifdef CONFIG_PCI extern int (*ar71xx_pci_plat_dev_init)(struct pci_dev *dev); extern unsigned ar71xx_pci_nr_irqs __initdata; extern struct ar71xx_pci_irq *ar71xx_pci_irq_map __initdata; @@ -35,5 +36,11 @@ int ar724x_pcibios_map_irq(const struct pci_dev *dev, int ar724x_pcibios_init(void) __init; 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 */ |