diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-16 22:37:51 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-16 22:37:51 -0400 |
| commit | 8c95b4773dd8d0415269ffad7301ef96d75be8ee (patch) | |
| tree | 996401ce91c2a652fcff690e2c8bf88f2014d307 /drivers/net/wireless/iwlwifi/iwl-rfkill.h | |
| parent | bcff122d478b774f4fd5262f35eedebe2f2fb274 (diff) | |
| parent | 30b89b0f5e1313c8a5a039abeaa89248b6338d81 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.26
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-rfkill.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-rfkill.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-rfkill.h b/drivers/net/wireless/iwlwifi/iwl-rfkill.h index e7aa51a1db18..a7f04b855403 100644 --- a/drivers/net/wireless/iwlwifi/iwl-rfkill.h +++ b/drivers/net/wireless/iwlwifi/iwl-rfkill.h | |||
| @@ -34,7 +34,7 @@ struct iwl_priv; | |||
| 34 | #include <linux/input.h> | 34 | #include <linux/input.h> |
| 35 | 35 | ||
| 36 | 36 | ||
| 37 | #ifdef CONFIG_IWLCORE_RFKILL | 37 | #ifdef CONFIG_IWLWIFI_RFKILL |
| 38 | struct iwl_rfkill_mngr { | 38 | struct iwl_rfkill_mngr { |
| 39 | struct rfkill *rfkill; | 39 | struct rfkill *rfkill; |
| 40 | struct input_dev *input_dev; | 40 | struct input_dev *input_dev; |