Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus

[linux-2.6-omap-h63xx.git] / fs / coda / psdev.c

diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
index e3eb3556622b6808c6d15515e18e597a0ddc4f5b..cfd29da714d1e9bf9b9f41338c09723ff09422de 100644 (file)
--- a/fs/coda/psdev.c
+++ b/fs/coda/psdev.c
@@ -363,7 +363,7 @@ static int init_coda_psdev(void)
        }               
        for (i = 0; i < MAX_CODADEVS; i++)
                device_create(coda_psdev_class, NULL,
-                             MKDEV(CODA_PSDEV_MAJOR,i), "cfs%d", i);
+                             MKDEV(CODA_PSDEV_MAJOR, i), NULL, "cfs%d", i);
        coda_sysctl_init();
        goto out;
 
@@ -377,11 +377,7 @@ MODULE_AUTHOR("Jan Harkes, Peter J. Braam");
 MODULE_DESCRIPTION("Coda Distributed File System VFS interface");
 MODULE_ALIAS_CHARDEV_MAJOR(CODA_PSDEV_MAJOR);
 MODULE_LICENSE("GPL");
-#ifdef CONFIG_CODA_FS_OLD_API
-MODULE_VERSION("5.3.21");
-#else
 MODULE_VERSION("6.6");
-#endif
 
 static int __init init_coda(void)
 {