Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus

[karo-tx-linux.git] / drivers / char / bsr.c

diff --git a/drivers/char/bsr.c b/drivers/char/bsr.c
index b650b4e48e5042654c139ea0777befe7bbebab4a..456f54db73e2aa0fa395ede67cad3b2b80a40feb 100644 (file)
--- a/drivers/char/bsr.c
+++ b/drivers/char/bsr.c
@@ -229,9 +229,8 @@ static int bsr_create_devs(struct device_node *bn)
                if (result)
                        goto out_err;
 
-               cur->bsr_device = device_create_drvdata(bsr_class, NULL,
-                                                       cur->bsr_dev,
-                                                       cur, cur->bsr_name);
+               cur->bsr_device = device_create(bsr_class, NULL, cur->bsr_dev,
+                                               cur, cur->bsr_name);
                if (!cur->bsr_device) {
                        printk(KERN_ERR "device_create failed for %s\n",
                               cur->bsr_name);