diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2012-09-05 16:17:42 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-09-05 16:17:42 +0200 |
| commit | 188ce5abebf56ec732f652abe608b94c317e4963 (patch) | |
| tree | 23bda38c221abb46b566a1aef36029eab00a50b9 /include/linux/miscdevice.h | |
| parent | iwlwifi: fix antenna bitmask (diff) | |
| parent | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next (diff) | |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'include/linux/miscdevice.h')
| -rw-r--r-- | include/linux/miscdevice.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h index 0549d2115507..e0deeb2cc939 100644 --- a/include/linux/miscdevice.h +++ b/include/linux/miscdevice.h @@ -35,6 +35,7 @@ #define MPT_MINOR 220 #define MPT2SAS_MINOR 221 #define UINPUT_MINOR 223 +#define MISC_MCELOG_MINOR 227 #define HPET_MINOR 228 #define FUSE_MINOR 229 #define KVM_MINOR 232 |