diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-31 07:53:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-31 07:53:43 -0400 |
| commit | 7bee946358c3cb957d4aa648fc5ab3cad0b232d0 (patch) | |
| tree | 693061ebde2abc35ecc846e5084630d7225aaaff /include/linux/miscdevice.h | |
| parent | d820ac4c2fa881079e6b689d2098adce337558ae (diff) | |
| parent | 15f7176eb1cccec0a332541285ee752b935c1c85 (diff) | |
Merge branch 'linus' into locking-for-linus
Conflicts:
lib/Kconfig.debug
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 a820f816a49e..beb6ec99cfef 100644 --- a/include/linux/miscdevice.h +++ b/include/linux/miscdevice.h | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #define TUN_MINOR 200 | 26 | #define TUN_MINOR 200 |
| 27 | #define MWAVE_MINOR 219 /* ACP/Mwave Modem */ | 27 | #define MWAVE_MINOR 219 /* ACP/Mwave Modem */ |
| 28 | #define MPT_MINOR 220 | 28 | #define MPT_MINOR 220 |
| 29 | #define MPT2SAS_MINOR 221 | ||
| 29 | #define HPET_MINOR 228 | 30 | #define HPET_MINOR 228 |
| 30 | #define FUSE_MINOR 229 | 31 | #define FUSE_MINOR 229 |
| 31 | #define KVM_MINOR 232 | 32 | #define KVM_MINOR 232 |