Merge branch 'master' into can-usb1

[lincan.git] / lincan / src / main.c

diff --git a/lincan/src/main.c b/lincan/src/main.c
index e4760191de9884dfe1679e59691f26a8308d0675..52cec59316954658a5e2df181f85b735fc2e11ba 100644 (file)
--- a/lincan/src/main.c
+++ b/lincan/src/main.c
@@ -373,9 +373,11 @@ int init_module(void)
                        this_dev=class_device_create(can_class, MKDEV(major, dev_minor), NULL,  "can%d", dev_minor);
                      #elif  LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25) /* >= 2.6.15 */
                        this_dev=class_device_create(can_class, NULL, MKDEV(major, dev_minor), NULL,  "can%d", dev_minor);
-                     #else /* >= 2.6.26 */
+                     #elif  LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,27)
                        this_dev=device_create_drvdata(can_class, NULL, MKDEV(major, dev_minor), objects_p[i],  "can%d", dev_minor);
-                     #endif /* >= 2.6.26 */
+                     #else /* >= 2.6.28 */
+                       this_dev=device_create(can_class, NULL, MKDEV(major, dev_minor), objects_p[i],  "can%d", dev_minor);
+                     #endif /* >= 2.6.28 */
                        if(IS_ERR(this_dev)){
                                CANMSG("problem to create device \"can%d\" in the class \"can\"\n", dev_minor);
                      #if  LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25)