diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-12-16 05:23:45 -0500 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-12-16 05:23:45 -0500 |
| commit | c4de673b775e4db48cd2db6277e0c6714332ca0c (patch) | |
| tree | 84f9e4728e6ccf257236d2ba063b6e784ec8b65d /include/linux/cmdline-parser.h | |
| parent | bafdc614a1f4f8be8cde41b8ab10ac17e67c1837 (diff) | |
| parent | 55957fb7a0b61d8ab6ff3f04e279b8fc22b738fa (diff) | |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'include/linux/cmdline-parser.h')
| -rw-r--r-- | include/linux/cmdline-parser.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/cmdline-parser.h b/include/linux/cmdline-parser.h index 98e892ef6d5a..a0f9280421ec 100644 --- a/include/linux/cmdline-parser.h +++ b/include/linux/cmdline-parser.h | |||
| @@ -8,6 +8,8 @@ | |||
| 8 | #define CMDLINEPARSEH | 8 | #define CMDLINEPARSEH |
| 9 | 9 | ||
| 10 | #include <linux/blkdev.h> | 10 | #include <linux/blkdev.h> |
| 11 | #include <linux/fs.h> | ||
| 12 | #include <linux/slab.h> | ||
| 11 | 13 | ||
| 12 | /* partition flags */ | 14 | /* partition flags */ |
| 13 | #define PF_RDONLY 0x01 /* Device is read only */ | 15 | #define PF_RDONLY 0x01 /* Device is read only */ |