Merge remote branch 'origin' into secretlab/next-spi

This commit is contained in:
Grant Likely 2010-05-25 00:38:26 -06:00
commit b1e50ebcf2
6890 changed files with 470517 additions and 215344 deletions

View file

@ -26,6 +26,8 @@
struct wl12xx_platform_data {
void (*set_power)(bool enable);
/* SDIO only: IRQ number if WLAN_IRQ line is used, 0 for SDIO IRQs */
int irq;
bool use_eeprom;
};