diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-11 13:27:47 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 13:27:47 +0200 |
| commit | c4c0c56a7a85ed5725786219e4fbca7e840b1531 (patch) | |
| tree | c9d6b35a571fd5e80ddf5bf4a60142480eaa18d8 /drivers/char/misc.c | |
| parent | 5127bed588a2f8f3a1f732de2a8a190b7df5dce3 (diff) | |
| parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
Merge branch 'linus' into core/rcu
Diffstat (limited to 'drivers/char/misc.c')
| -rw-r--r-- | drivers/char/misc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/misc.c b/drivers/char/misc.c index 6e1563c3d30a..999aa779c08a 100644 --- a/drivers/char/misc.c +++ b/drivers/char/misc.c @@ -217,8 +217,8 @@ int misc_register(struct miscdevice * misc) misc_minors[misc->minor >> 3] |= 1 << (misc->minor & 7); dev = MKDEV(MISC_MAJOR, misc->minor); - misc->this_device = device_create(misc_class, misc->parent, dev, - "%s", misc->name); + misc->this_device = device_create_drvdata(misc_class, misc->parent, + dev, NULL, "%s", misc->name); if (IS_ERR(misc->this_device)) { err = PTR_ERR(misc->this_device); goto out; |