Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index d41dc67ba4cc..3670d77e912c 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1145,12 +1145,11 @@ static int __init acm_init(void)
         acm_tty_driver->owner = THIS_MODULE,
         acm_tty_driver->driver_name = "acm",
         acm_tty_driver->name = "ttyACM",
-        acm_tty_driver->devfs_name = "usb/acm/",
         acm_tty_driver->major = ACM_TTY_MAJOR,
         acm_tty_driver->minor_start = 0,
         acm_tty_driver->type = TTY_DRIVER_TYPE_SERIAL,
         acm_tty_driver->subtype = SERIAL_TYPE_NORMAL,
-        acm_tty_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS,
+        acm_tty_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
         acm_tty_driver->init_termios = tty_std_termios;
         acm_tty_driver->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;
         tty_set_operations(acm_tty_driver, &acm_ops);