diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 03:32:01 +0200 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 03:32:01 +0200 |
commit | 5615ca7906aefbdc3318604c89db5931d0a25910 (patch) | |
tree | c34bcc7e314f49005ad88ac84c908128729c0329 /drivers/char/stallion.c | |
parent | Merge branch 'master' (diff) | |
parent | Merge branch 'master' (diff) | |
download | linux-5615ca7906aefbdc3318604c89db5931d0a25910.tar.xz linux-5615ca7906aefbdc3318604c89db5931d0a25910.zip |
Merge branch 'upstream'
Diffstat (limited to 'drivers/char/stallion.c')
-rw-r--r-- | drivers/char/stallion.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c index 951545a6ef2d..1c686414e0a1 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; |