diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-24 08:09:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-24 08:09:26 +0200 |
| commit | 28afe961a18f77b2249062499bdbf70fd2ec6bba (patch) | |
| tree | 71a5cb32924b8c8256bbc0f2f81c6b8c2ac79108 /drivers/video/console/fbcon.c | |
| parent | 1e01cb0c6ff7e9ddb6547551794c6aa82785a7cb (diff) | |
| parent | 338b9bb3adac0d2c5a1e180491d9b001d624c402 (diff) | |
| download | op-kernel-dev-28afe961a18f77b2249062499bdbf70fd2ec6bba.zip op-kernel-dev-28afe961a18f77b2249062499bdbf70fd2ec6bba.tar.gz | |
Merge branch 'linus' into tracing/urgent
Diffstat (limited to 'drivers/video/console/fbcon.c')
| -rw-r--r-- | drivers/video/console/fbcon.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 97aff8d..4be3b46 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c @@ -3586,7 +3586,8 @@ static int __init fb_console_init(void) acquire_console_sem(); fb_register_client(&fbcon_event_notifier); - fbcon_device = device_create(fb_class, NULL, MKDEV(0, 0), "fbcon"); + fbcon_device = device_create_drvdata(fb_class, NULL, MKDEV(0, 0), + NULL, "fbcon"); if (IS_ERR(fbcon_device)) { printk(KERN_WARNING "Unable to create device " |
