diff options
| -rw-r--r-- | Documentation/devices.txt | 1 | ||||
| -rw-r--r-- | fs/fuse/cuse.c | 5 | ||||
| -rw-r--r-- | include/linux/miscdevice.h | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/devices.txt b/Documentation/devices.txt index 23721d3be3e6..80b72419ffd8 100644 --- a/Documentation/devices.txt +++ b/Documentation/devices.txt | |||
| @@ -414,6 +414,7 @@ Your cooperation is appreciated. | |||
| 414 | 200 = /dev/net/tun TAP/TUN network device | 414 | 200 = /dev/net/tun TAP/TUN network device |
| 415 | 201 = /dev/button/gulpb Transmeta GULP-B buttons | 415 | 201 = /dev/button/gulpb Transmeta GULP-B buttons |
| 416 | 202 = /dev/emd/ctl Enhanced Metadisk RAID (EMD) control | 416 | 202 = /dev/emd/ctl Enhanced Metadisk RAID (EMD) control |
| 417 | 203 = /dev/cuse Cuse (character device in user-space) | ||
| 417 | 204 = /dev/video/em8300 EM8300 DVD decoder control | 418 | 204 = /dev/video/em8300 EM8300 DVD decoder control |
| 418 | 205 = /dev/video/em8300_mv EM8300 DVD decoder video | 419 | 205 = /dev/video/em8300_mv EM8300 DVD decoder video |
| 419 | 206 = /dev/video/em8300_ma EM8300 DVD decoder audio | 420 | 206 = /dev/video/em8300_ma EM8300 DVD decoder audio |
diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c index adbfd66b380f..24da581cb52b 100644 --- a/fs/fuse/cuse.c +++ b/fs/fuse/cuse.c | |||
| @@ -589,11 +589,14 @@ static struct attribute *cuse_class_dev_attrs[] = { | |||
| 589 | ATTRIBUTE_GROUPS(cuse_class_dev); | 589 | ATTRIBUTE_GROUPS(cuse_class_dev); |
| 590 | 590 | ||
| 591 | static struct miscdevice cuse_miscdev = { | 591 | static struct miscdevice cuse_miscdev = { |
| 592 | .minor = MISC_DYNAMIC_MINOR, | 592 | .minor = CUSE_MINOR, |
| 593 | .name = "cuse", | 593 | .name = "cuse", |
| 594 | .fops = &cuse_channel_fops, | 594 | .fops = &cuse_channel_fops, |
| 595 | }; | 595 | }; |
| 596 | 596 | ||
| 597 | MODULE_ALIAS_MISCDEV(CUSE_MINOR); | ||
| 598 | MODULE_ALIAS("devname:cuse"); | ||
| 599 | |||
| 597 | static int __init cuse_init(void) | 600 | static int __init cuse_init(void) |
| 598 | { | 601 | { |
| 599 | int i, rc; | 602 | int i, rc; |
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h index 09c2300ddb37..c8cf093d8b71 100644 --- a/include/linux/miscdevice.h +++ b/include/linux/miscdevice.h | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #define I2O_MINOR 166 | 31 | #define I2O_MINOR 166 |
| 32 | #define MICROCODE_MINOR 184 | 32 | #define MICROCODE_MINOR 184 |
| 33 | #define TUN_MINOR 200 | 33 | #define TUN_MINOR 200 |
| 34 | #define CUSE_MINOR 203 | ||
| 34 | #define MWAVE_MINOR 219 /* ACP/Mwave Modem */ | 35 | #define MWAVE_MINOR 219 /* ACP/Mwave Modem */ |
| 35 | #define MPT_MINOR 220 | 36 | #define MPT_MINOR 220 |
| 36 | #define MPT2SAS_MINOR 221 | 37 | #define MPT2SAS_MINOR 221 |
