diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-08 21:13:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-08 21:13:13 -0400 |
| commit | d2daeabf62a5fb205d413c35cf604021db17536b (patch) | |
| tree | 844ced1a54745c14ea45d33ccad4eae6e7253322 /include/linux/rfkill.h | |
| parent | c3b85423072c0739d76b7c54080d3f3ccc5dad4d (diff) | |
| parent | 1ce822fa04fd6878f079461a4b8affe4bb5ec27b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include/linux/rfkill.h')
| -rw-r--r-- | include/linux/rfkill.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h index e73e2429a1b1..2ce29831feb6 100644 --- a/include/linux/rfkill.h +++ b/include/linux/rfkill.h | |||
| @@ -99,7 +99,6 @@ enum rfkill_user_states { | |||
| 99 | #undef RFKILL_STATE_UNBLOCKED | 99 | #undef RFKILL_STATE_UNBLOCKED |
| 100 | #undef RFKILL_STATE_HARD_BLOCKED | 100 | #undef RFKILL_STATE_HARD_BLOCKED |
| 101 | 101 | ||
| 102 | #include <linux/types.h> | ||
| 103 | #include <linux/kernel.h> | 102 | #include <linux/kernel.h> |
| 104 | #include <linux/list.h> | 103 | #include <linux/list.h> |
| 105 | #include <linux/mutex.h> | 104 | #include <linux/mutex.h> |