diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-22 14:18:40 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-22 14:18:40 -0400 |
| commit | d14a7679ae9b7d4eb4b92e81f5039b719fd98c4d (patch) | |
| tree | cb12e313178092e92136704660d68f7ce6578d19 /include | |
| parent | de72e5de062e48a992d6cafe2291a82fe498d641 (diff) | |
| parent | 154839962a582b8eb661cde94ef3af0e03b374d7 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include')
| -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 2ce29831feb6..278777fa8a3a 100644 --- a/include/linux/rfkill.h +++ b/include/linux/rfkill.h | |||
| @@ -224,7 +224,7 @@ void rfkill_destroy(struct rfkill *rfkill); | |||
| 224 | * should be blocked) so that drivers need not keep track of the soft | 224 | * should be blocked) so that drivers need not keep track of the soft |
| 225 | * block state -- which they might not be able to. | 225 | * block state -- which they might not be able to. |
| 226 | */ | 226 | */ |
| 227 | bool __must_check rfkill_set_hw_state(struct rfkill *rfkill, bool blocked); | 227 | bool rfkill_set_hw_state(struct rfkill *rfkill, bool blocked); |
| 228 | 228 | ||
| 229 | /** | 229 | /** |
| 230 | * rfkill_set_sw_state - Set the internal rfkill software block state | 230 | * rfkill_set_sw_state - Set the internal rfkill software block state |