diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 05:32:17 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 05:32:17 -0400 |
| commit | 206855c321adee56db3946ca09a5887cddb9d598 (patch) | |
| tree | 13a2729d4d0e37170552bd9ad3c6bba71ba0c55c /include/linux/major.h | |
| parent | e8d3f455de4f42d4bab2f6f1aeb2cf3bd18eb508 (diff) | |
| parent | cb58ffc3889f0545628f138f849e759a331b8ddc (diff) | |
Merge branch 'x86/urgent' into core/signal
Conflicts:
arch/x86/kernel/signal_64.c
Diffstat (limited to 'include/linux/major.h')
| -rw-r--r-- | include/linux/major.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/major.h b/include/linux/major.h index 53d5fafd85c3..88249452b935 100644 --- a/include/linux/major.h +++ b/include/linux/major.h | |||
| @@ -170,4 +170,6 @@ | |||
| 170 | 170 | ||
| 171 | #define VIOTAPE_MAJOR 230 | 171 | #define VIOTAPE_MAJOR 230 |
| 172 | 172 | ||
| 173 | #define BLOCK_EXT_MAJOR 259 | ||
| 174 | |||
| 173 | #endif | 175 | #endif |