diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
| commit | 0bd2af46839ad6262d25714a6ec0365db9d6b98f (patch) | |
| tree | dcced72d230d69fd0c5816ac6dd03ab84799a93e /arch/um/drivers/mmapper_kern.c | |
| parent | e138a5d2356729b8752e88520cc1525fae9794ac (diff) | |
| parent | f26b90440cd74c78fe10c9bd5160809704a9627c (diff) | |
Merge ../scsi-rc-fixes-2.6
Diffstat (limited to 'arch/um/drivers/mmapper_kern.c')
| -rw-r--r-- | arch/um/drivers/mmapper_kern.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/um/drivers/mmapper_kern.c b/arch/um/drivers/mmapper_kern.c index 9a3b5daf6250..df3516e47d4d 100644 --- a/arch/um/drivers/mmapper_kern.c +++ b/arch/um/drivers/mmapper_kern.c | |||
| @@ -95,7 +95,8 @@ static const struct file_operations mmapper_fops = { | |||
| 95 | .release = mmapper_release, | 95 | .release = mmapper_release, |
| 96 | }; | 96 | }; |
| 97 | 97 | ||
| 98 | static const struct miscdevice mmapper_dev = { | 98 | /* No locking needed - only used (and modified) by below initcall and exitcall. */ |
| 99 | static struct miscdevice mmapper_dev = { | ||
| 99 | .minor = MISC_DYNAMIC_MINOR, | 100 | .minor = MISC_DYNAMIC_MINOR, |
| 100 | .name = "mmapper", | 101 | .name = "mmapper", |
| 101 | .fops = &mmapper_fops | 102 | .fops = &mmapper_fops |