diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-20 23:39:47 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-20 23:39:47 +0100 |
| commit | 55fa518867978e1f5fd8353098f80d125ac734d7 (patch) | |
| tree | 3502b331c1f9ec4cac25dc8ba30b6a0a324e350c /drivers/char/vc_screen.c | |
| parent | bb1f24bf00a85f666b56a09b7cdbfd221af16c2c (diff) | |
| parent | eea0579fc85e64e9f05361d5aacf496fe7a151aa (diff) | |
Merge branch 'topic/pcsp-fix' into topic/misc
Diffstat (limited to 'drivers/char/vc_screen.c')
| -rw-r--r-- | drivers/char/vc_screen.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/char/vc_screen.c b/drivers/char/vc_screen.c index c2ae52dd53d1..4f3b3f95fc42 100644 --- a/drivers/char/vc_screen.c +++ b/drivers/char/vc_screen.c @@ -481,10 +481,10 @@ static struct class *vc_class; void vcs_make_sysfs(struct tty_struct *tty) { - device_create_drvdata(vc_class, NULL, MKDEV(VCS_MAJOR, tty->index + 1), - NULL, "vcs%u", tty->index + 1); - device_create_drvdata(vc_class, NULL, MKDEV(VCS_MAJOR, tty->index + 129), - NULL, "vcsa%u", tty->index + 1); + device_create(vc_class, NULL, MKDEV(VCS_MAJOR, tty->index + 1), NULL, + "vcs%u", tty->index + 1); + device_create(vc_class, NULL, MKDEV(VCS_MAJOR, tty->index + 129), NULL, + "vcsa%u", tty->index + 1); } void vcs_remove_sysfs(struct tty_struct *tty) @@ -499,7 +499,7 @@ int __init vcs_init(void) panic("unable to get major %d for vcs device", VCS_MAJOR); vc_class = class_create(THIS_MODULE, "vc"); - device_create_drvdata(vc_class, NULL, MKDEV(VCS_MAJOR, 0), NULL, "vcs"); - device_create_drvdata(vc_class, NULL, MKDEV(VCS_MAJOR, 128), NULL, "vcsa"); + device_create(vc_class, NULL, MKDEV(VCS_MAJOR, 0), NULL, "vcs"); + device_create(vc_class, NULL, MKDEV(VCS_MAJOR, 128), NULL, "vcsa"); return 0; } |