diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-22 16:13:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-22 16:13:47 -0400 |
commit | 53baaaa9682c230410a057263d1ce2922f43ddc4 (patch) | |
tree | f5cced5622130f780d76953b284a631c3d226488 /drivers/char/vt.c | |
parent | f10140fbe5f97ecfeda986a12d0f1bad75642779 (diff) | |
parent | 3f9787046ea37a26170dc4439efa21f8d23a9978 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (79 commits)
arm: bus_id -> dev_name() and dev_set_name() conversions
sparc64: fix up bus_id changes in sparc core code
3c59x: handle pci_name() being const
MTD: handle pci_name() being const
HP iLO driver
sysdev: Convert the x86 mce tolerant sysdev attribute to generic attribute
sysdev: Add utility functions for simple int/ulong variable sysdev attributes
sysdev: Pass the attribute to the low level sysdev show/store function
driver core: Suppress sysfs warnings for device_rename().
kobject: Transmit return value of call_usermodehelper() to caller
sysfs-rules.txt: reword API stability statement
debugfs: Implement debugfs_remove_recursive()
HOWTO: change email addresses of James in HOWTO
always enable FW_LOADER unless EMBEDDED=y
uio-howto.tmpl: use unique output names
uio-howto.tmpl: use standard copyright/legal markings
sysfs: don't call notify_change
sysdev: fix debugging statements in registration code.
kobject: should use kobject_put() in kset-example
kobject: reorder kobject to save space on 64 bit builds
...
Diffstat (limited to 'drivers/char/vt.c')
-rw-r--r-- | drivers/char/vt.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/char/vt.c b/drivers/char/vt.c index 935f1c207a1f..e32a076d5f1f 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c | |||
@@ -3425,9 +3425,10 @@ int register_con_driver(const struct consw *csw, int first, int last) | |||
3425 | if (retval) | 3425 | if (retval) |
3426 | goto err; | 3426 | goto err; |
3427 | 3427 | ||
3428 | con_driver->dev = device_create(vtconsole_class, NULL, | 3428 | con_driver->dev = device_create_drvdata(vtconsole_class, NULL, |
3429 | MKDEV(0, con_driver->node), | 3429 | MKDEV(0, con_driver->node), |
3430 | "vtcon%i", con_driver->node); | 3430 | NULL, "vtcon%i", |
3431 | con_driver->node); | ||
3431 | 3432 | ||
3432 | if (IS_ERR(con_driver->dev)) { | 3433 | if (IS_ERR(con_driver->dev)) { |
3433 | printk(KERN_WARNING "Unable to create device for %s; " | 3434 | printk(KERN_WARNING "Unable to create device for %s; " |
@@ -3535,9 +3536,10 @@ static int __init vtconsole_class_init(void) | |||
3535 | struct con_driver *con = ®istered_con_driver[i]; | 3536 | struct con_driver *con = ®istered_con_driver[i]; |
3536 | 3537 | ||
3537 | if (con->con && !con->dev) { | 3538 | if (con->con && !con->dev) { |
3538 | con->dev = device_create(vtconsole_class, NULL, | 3539 | con->dev = device_create_drvdata(vtconsole_class, NULL, |
3539 | MKDEV(0, con->node), | 3540 | MKDEV(0, con->node), |
3540 | "vtcon%i", con->node); | 3541 | NULL, "vtcon%i", |
3542 | con->node); | ||
3541 | 3543 | ||
3542 | if (IS_ERR(con->dev)) { | 3544 | if (IS_ERR(con->dev)) { |
3543 | printk(KERN_WARNING "Unable to create " | 3545 | printk(KERN_WARNING "Unable to create " |