Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ar71xx: fix build error w/o CONFIG_PCI

Browse source 
SVN-Revision: 26606
This commit is contained in:
Gabor Juhos 2011-04-12 13:14:56 +00:00
parent adb6217471
commit fa9f45f345
3 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
target/linux/ar71xx/files/arch/mips/ar71xx/dev-ap91-pci.h
View file

@ -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; void ap91_pci_setup_wmac_gpio(u32 mask, u32 val) __init;
#else #else
static inline void ap91_pci_init(u8 *cal_data, u8 *mac_addr) { } 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) { } static inline void ap91_pci_setup_wmac_gpio(u32 mask, u32 gpio) { }
#endif #endif

7
target/linux/ar71xx/files/arch/mips/ar71xx/mach-eap7660d.c
View file

@ -46,6 +46,7 @@ static char eap7660d_wmac1_mac[6];
static u16 eap7660d_wmac0_eeprom[ATH5K_PLAT_EEP_MAX_WORDS]; static u16 eap7660d_wmac0_eeprom[ATH5K_PLAT_EEP_MAX_WORDS];
static u16 eap7660d_wmac1_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 = { static struct ar71xx_pci_irq eap7660d_pci_irqs[] __initdata = {
{ {
.slot = 0, .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_plat_dev_init = eap7660d_pci_plat_dev_init;
ar71xx_pci_init(ARRAY_SIZE(eap7660d_pci_irqs), eap7660d_pci_irqs); 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 = { static struct gpio_led eap7660d_leds_gpio[] __initdata = {
{ {

7
target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/pci.h
View file

@ -20,6 +20,7 @@ struct ar71xx_pci_irq {
u8 pin; u8 pin;
}; };
#ifdef CONFIG_PCI
extern int (*ar71xx_pci_plat_dev_init)(struct pci_dev *dev); extern int (*ar71xx_pci_plat_dev_init)(struct pci_dev *dev);
extern unsigned ar71xx_pci_nr_irqs __initdata; extern unsigned ar71xx_pci_nr_irqs __initdata;
extern struct ar71xx_pci_irq *ar71xx_pci_irq_map __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 ar724x_pcibios_init(void) __init;
int ar71xx_pci_init(unsigned nr_irqs, struct ar71xx_pci_irq *map) __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 */ #endif /* __ASM_MACH_AR71XX_PCI_H */