diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-23 22:03:51 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-23 22:03:51 -0400 |
| commit | 74d154189d597b91da4322996dbf4f5c3d1544ab (patch) | |
| tree | 6f09861b5e2f875d2d8ea2127b16add9103221c6 /include/linux/rfkill.h | |
| parent | 5a6338db37885af06760d40cad589316e48431e9 (diff) | |
| parent | ffafa60d496f80c250f2ae0340ae94434c0b0b4d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwmc3200wifi/netdev.c
net/wireless/scan.c
Diffstat (limited to 'include/linux/rfkill.h')
| -rw-r--r-- | include/linux/rfkill.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h index f3d5812693d6..10202903141a 100644 --- a/include/linux/rfkill.h +++ b/include/linux/rfkill.h | |||
| @@ -238,7 +238,7 @@ void rfkill_destroy(struct rfkill *rfkill); | |||
| 238 | * should be blocked) so that drivers need not keep track of the soft | 238 | * should be blocked) so that drivers need not keep track of the soft |
| 239 | * block state -- which they might not be able to. | 239 | * block state -- which they might not be able to. |
| 240 | */ | 240 | */ |
| 241 | bool __must_check rfkill_set_hw_state(struct rfkill *rfkill, bool blocked); | 241 | bool rfkill_set_hw_state(struct rfkill *rfkill, bool blocked); |
| 242 | 242 | ||
| 243 | /** | 243 | /** |
| 244 | * rfkill_set_sw_state - Set the internal rfkill software block state | 244 | * rfkill_set_sw_state - Set the internal rfkill software block state |