diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-05-25 00:38:26 -0600 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-05-25 00:38:26 -0600 |
commit | b1e50ebcf24668e57f058deb48b0704b5391ed0f (patch) | |
tree | 17e1b69b249d0738317b732186340c9dd053f1a1 /include/linux/spi | |
parent | 0c2a2ae32793e3500a15a449612485f5d17dd431 (diff) | |
parent | 7e125f7b9cbfce4101191b8076d606c517a73066 (diff) | |
download | kernel_samsung_smdk4412-b1e50ebcf24668e57f058deb48b0704b5391ed0f.zip kernel_samsung_smdk4412-b1e50ebcf24668e57f058deb48b0704b5391ed0f.tar.gz kernel_samsung_smdk4412-b1e50ebcf24668e57f058deb48b0704b5391ed0f.tar.bz2 |
Merge remote branch 'origin' into secretlab/next-spi
Diffstat (limited to 'include/linux/spi')
-rw-r--r-- | include/linux/spi/wl12xx.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/spi/wl12xx.h b/include/linux/spi/wl12xx.h index aed64ed..a223ecb 100644 --- a/include/linux/spi/wl12xx.h +++ b/include/linux/spi/wl12xx.h @@ -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; }; |