diff options
author | David S. Miller <davem@davemloft.net> | 2009-07-08 18:13:13 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-07-08 18:13:13 -0700 |
commit | d2daeabf62a5fb205d413c35cf604021db17536b (patch) | |
tree | 844ced1a54745c14ea45d33ccad4eae6e7253322 /include | |
parent | c3b85423072c0739d76b7c54080d3f3ccc5dad4d (diff) | |
parent | 1ce822fa04fd6878f079461a4b8affe4bb5ec27b (diff) | |
download | linux-stable-d2daeabf62a5fb205d413c35cf604021db17536b.tar.gz linux-stable-d2daeabf62a5fb205d413c35cf604021db17536b.tar.bz2 linux-stable-d2daeabf62a5fb205d413c35cf604021db17536b.zip |
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 | 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 { #undef RFKILL_STATE_UNBLOCKED #undef RFKILL_STATE_HARD_BLOCKED -#include <linux/types.h> #include <linux/kernel.h> #include <linux/list.h> #include <linux/mutex.h> |