git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
[pandora-kernel.git]
/
arch
/
mips
/
kernel
/
rtlx.c
diff --git
a/arch/mips/kernel/rtlx.c
b/arch/mips/kernel/rtlx.c
index
b556419
..
dfd868b
100644
(file)
--- a/
arch/mips/kernel/rtlx.c
+++ b/
arch/mips/kernel/rtlx.c
@@
-522,8
+522,8
@@
static int __init rtlx_module_init(void)
atomic_set(&channel_wqs[i].in_open, 0);
mutex_init(&channel_wqs[i].mutex);
atomic_set(&channel_wqs[i].in_open, 0);
mutex_init(&channel_wqs[i].mutex);
- dev = device_create(mt_class, NULL, MKDEV(major, i),
- "%s%d", module_name, i);
+ dev = device_create
_drvdata
(mt_class, NULL, MKDEV(major, i),
+
NULL,
"%s%d", module_name, i);
if (IS_ERR(dev)) {
err = PTR_ERR(dev);
goto out_chrdev;
if (IS_ERR(dev)) {
err = PTR_ERR(dev);
goto out_chrdev;