aboutsummaryrefslogtreecommitdiff
path: root/drivers/char/stallion.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-28 21:32:01 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-28 21:32:01 -0400
commit5615ca7906aefbdc3318604c89db5931d0a25910 (patch)
treec34bcc7e314f49005ad88ac84c908128729c0329 /drivers/char/stallion.c
parent7a9f8f93d2dad38f30fbc79d8a1e6517373aa4b6 (diff)
parent9dfb7808fb05643b0d06df7411b94d9546696bf1 (diff)
Merge branch 'upstream'
Diffstat (limited to 'drivers/char/stallion.c')
-rw-r--r--drivers/char/stallion.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
index 951545a6ef2..1c686414e0a 100644
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
@@ -3095,7 +3095,9 @@ static int __init stl_init(void)
devfs_mk_cdev(MKDEV(STL_SIOMEMMAJOR, i),
S_IFCHR|S_IRUSR|S_IWUSR,
"staliomem/%d", i);
- class_device_create(stallion_class, MKDEV(STL_SIOMEMMAJOR, i), NULL, "staliomem%d", i);
+ class_device_create(stallion_class, NULL,
+ MKDEV(STL_SIOMEMMAJOR, i), NULL,
+ "staliomem%d", i);
}
stl_serial->owner = THIS_MODULE;