diff options
| author | Kalle Valo <kvalo@qca.qualcomm.com> | 2014-05-14 16:20:08 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2014-05-14 16:20:08 +0300 |
| commit | e21353576df1fae38710bdbff1c3abfe49f651cd (patch) | |
| tree | 3074ad8e4be3762cae1e1f5d11d103ce8c216329 /include/linux | |
| parent | d9bc4b9b693d52dc14dc1de5dfec760634067d8c (diff) | |
| parent | 5f407acbb7d6a92841c455b37a6ad4833757740e (diff) | |
Merge remote-tracking branch 'wireless-next/master' into ath-next
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ath9k_platform.h | 2 | ||||
| -rw-r--r-- | include/linux/rfkill-gpio.h | 10 |
2 files changed, 2 insertions, 10 deletions
diff --git a/include/linux/ath9k_platform.h b/include/linux/ath9k_platform.h index 8598f8eacb20..a495a959e8a7 100644 --- a/include/linux/ath9k_platform.h +++ b/include/linux/ath9k_platform.h @@ -36,6 +36,8 @@ struct ath9k_platform_data { int (*get_mac_revision)(void); int (*external_reset)(void); + + bool use_eeprom; }; #endif /* _LINUX_ATH9K_PLATFORM_H */ diff --git a/include/linux/rfkill-gpio.h b/include/linux/rfkill-gpio.h index 4d09f6eab359..20bcb55498cd 100644 --- a/include/linux/rfkill-gpio.h +++ b/include/linux/rfkill-gpio.h @@ -27,21 +27,11 @@ * struct rfkill_gpio_platform_data - platform data for rfkill gpio device. * for unused gpio's, the expected value is -1. * @name: name for the gpio rf kill instance - * @reset_gpio: GPIO which is used for reseting rfkill switch - * @shutdown_gpio: GPIO which is used for shutdown of rfkill switch - * @power_clk_name: [optional] name of clk to turn off while blocked - * @gpio_runtime_close: clean up platform specific gpio configuration - * @gpio_runtime_setup: set up platform specific gpio configuration */ struct rfkill_gpio_platform_data { char *name; - int reset_gpio; - int shutdown_gpio; - const char *power_clk_name; enum rfkill_type type; - void (*gpio_runtime_close)(struct platform_device *); - int (*gpio_runtime_setup)(struct platform_device *); }; #endif /* __RFKILL_GPIO_H */ |