Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

[~andy/linux] / drivers / md / dm-ioctl.c

diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index 3ad60caea7732ca07b9209e340a9c3abaf1493b0..d13bb15a8a02981f69706048d32bfc64b83b73c1 100644 (file)
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -1472,7 +1472,6 @@ static struct file_operations _ctl_fops = {
 static struct miscdevice _dm_misc = {
        .minor          = MISC_DYNAMIC_MINOR,
        .name           = DM_NAME,
-       .devfs_name     = "mapper/control",
        .fops           = &_ctl_fops
 };