diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-10-12 11:27:20 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-10-12 11:27:28 -0400 |
| commit | 37eca0d64a2dbeece25969ec0698e1ff72bdcf39 (patch) | |
| tree | 54ba70f0428f586f4fe28d8b429b9f9e0799a17a /include/linux/miscdevice.h | |
| parent | 277b199800ac90811ac86d215063df1984f51619 (diff) | |
| parent | 3c06806e690885ce978ef180c8f8b6f8c17fb4b4 (diff) | |
Merge branch 'linus' into core/locking
Reason: Pull in the semaphore related changes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
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 bafffc737903..18fd13028ba1 100644 --- a/include/linux/miscdevice.h +++ b/include/linux/miscdevice.h | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #define MWAVE_MINOR 219 /* ACP/Mwave Modem */ | 33 | #define MWAVE_MINOR 219 /* ACP/Mwave Modem */ |
| 34 | #define MPT_MINOR 220 | 34 | #define MPT_MINOR 220 |
| 35 | #define MPT2SAS_MINOR 221 | 35 | #define MPT2SAS_MINOR 221 |
| 36 | #define UINPUT_MINOR 223 | ||
| 36 | #define HPET_MINOR 228 | 37 | #define HPET_MINOR 228 |
| 37 | #define FUSE_MINOR 229 | 38 | #define FUSE_MINOR 229 |
| 38 | #define KVM_MINOR 232 | 39 | #define KVM_MINOR 232 |