projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master'
[linux-2.6-block.git]
/
drivers
/
char
/
dsp56k.c
diff --git
a/drivers/char/dsp56k.c
b/drivers/char/dsp56k.c
index 26271e3ca82371542b9395fea1815e0b71f43290..8693835cb2d51f9f8868f1d2b6971e7d8942b69f 100644
(file)
--- a/
drivers/char/dsp56k.c
+++ b/
drivers/char/dsp56k.c
@@
-515,7
+515,7
@@
static int __init dsp56k_init_driver(void)
err = PTR_ERR(dsp56k_class);
goto out_chrdev;
}
err = PTR_ERR(dsp56k_class);
goto out_chrdev;
}
- class_device_create(dsp56k_class, MKDEV(DSP56K_MAJOR, 0), NULL, "dsp56k");
+ class_device_create(dsp56k_class,
NULL,
MKDEV(DSP56K_MAJOR, 0), NULL, "dsp56k");
err = devfs_mk_cdev(MKDEV(DSP56K_MAJOR, 0),
S_IFCHR | S_IRUSR | S_IWUSR, "dsp56k");
err = devfs_mk_cdev(MKDEV(DSP56K_MAJOR, 0),
S_IFCHR | S_IRUSR | S_IWUSR, "dsp56k");