diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-22 21:50:57 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-22 21:50:57 -0400 |
| commit | a5324343955997d1439f26518ddac567cd5d134b (patch) | |
| tree | f43558389c41e3a0f076c4ee55d77c4aa1561779 /include/linux/major.h | |
| parent | 8199d3a79c224bbe5943fa08684e1f93a17881b0 (diff) | |
| parent | a4936044001694f033fe4ea94d6034d51a6b465c (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/linux/major.h')
| -rw-r--r-- | include/linux/major.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/major.h b/include/linux/major.h index 4b62c42b842c..e36a46702d94 100644 --- a/include/linux/major.h +++ b/include/linux/major.h | |||
| @@ -100,6 +100,7 @@ | |||
| 100 | #define I2O_MAJOR 80 /* 80->87 */ | 100 | #define I2O_MAJOR 80 /* 80->87 */ |
| 101 | 101 | ||
| 102 | #define SHMIQ_MAJOR 85 /* Linux/mips, SGI /dev/shmiq */ | 102 | #define SHMIQ_MAJOR 85 /* Linux/mips, SGI /dev/shmiq */ |
| 103 | #define SCSI_CHANGER_MAJOR 86 | ||
| 103 | 104 | ||
| 104 | #define IDE6_MAJOR 88 | 105 | #define IDE6_MAJOR 88 |
| 105 | #define IDE7_MAJOR 89 | 106 | #define IDE7_MAJOR 89 |