diff options
| author | James Bottomley <jejb@mulgrave.(none)> | 2005-05-26 14:14:55 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.(none)> | 2005-05-26 14:14:55 -0400 |
| commit | 153b1e1fd957861e2c185473dd3c3d93561066e4 (patch) | |
| tree | c296359e8212ed83c2834b20a62b7a650f3d0fc2 /include/linux/major.h | |
| parent | cdbbde14cb55dd10771ce79154f787322d88411b (diff) | |
| parent | c3e9dda4f5702ee5b346f4770de53f79e8ad1d8d (diff) | |
Automatic merge of ../scsi-misc-2.6-old/
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 |