diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
| commit | 9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95 (patch) | |
| tree | 7ff8833745d2f268f897f6fa4a27263b4a572245 /include/linux/miscdevice.h | |
| parent | de18836e447c2dc30120c0919b8db8ddc0401cc4 (diff) | |
| parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) | |
Merge branch 'linus' into irq/threaded
Conflicts:
include/linux/irq.h
kernel/irq/handle.c
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 |