diff options
| author | Len Brown <len.brown@intel.com> | 2012-04-06 21:48:59 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-04-06 21:48:59 -0400 |
| commit | eeaab2d8af2cf1d36d7086f22e9de42d6dd2995c (patch) | |
| tree | 369b9c91a6d808944f07d2290fec6f9fe2731904 /include/linux/rfkill.h | |
| parent | ee01e663373343c63e0e3d364d09f6155378dbcc (diff) | |
| parent | aaef292acf3a78d9c0bb6fb72226077d286b45d7 (diff) | |
Merge branches 'idle-fix' and 'misc' into release
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 c6c608482cba..6fdf02737e9d 100644 --- a/include/linux/rfkill.h +++ b/include/linux/rfkill.h | |||
| @@ -117,10 +117,10 @@ enum rfkill_user_states { | |||
| 117 | #include <linux/kernel.h> | 117 | #include <linux/kernel.h> |
| 118 | #include <linux/list.h> | 118 | #include <linux/list.h> |
| 119 | #include <linux/mutex.h> | 119 | #include <linux/mutex.h> |
| 120 | #include <linux/device.h> | ||
| 121 | #include <linux/leds.h> | 120 | #include <linux/leds.h> |
| 122 | #include <linux/err.h> | 121 | #include <linux/err.h> |
| 123 | 122 | ||
| 123 | struct device; | ||
| 124 | /* this is opaque */ | 124 | /* this is opaque */ |
| 125 | struct rfkill; | 125 | struct rfkill; |
| 126 | 126 | ||
