[Armadeus-commitlog] SF.net SVN: armadeus: [664] trunk/target/linux/modules/ps2keyboard/core.c

[<ar...@us...>]

Revision: 664
          http://armadeus.svn.sourceforge.net/armadeus/?rev=664&view=rev
Author:   artemys
Date:     2007-10-28 06:54:59 -0700 (Sun, 28 Oct 2007)

Log Message:
-----------
NUX] Allow PS/2 IP driver to be compiled on recent Linux kernels

Modified Paths:
--------------
    trunk/target/linux/modules/ps2keyboard/core.c

Modified: trunk/target/linux/modules/ps2keyboard/core.c
===================================================================
--- trunk/target/linux/modules/ps2keyboard/core.c	2007-10-28 11:57:20 UTC (rev 663)
+++ trunk/target/linux/modules/ps2keyboard/core.c	2007-10-28 13:54:59 UTC (rev 664)
@@ -12,6 +12,7 @@
  * the Free Software Foundation.
  */
 
+#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/serio.h>
@@ -118,7 +119,11 @@
     
     return(IRQ_HANDLED);
 #else 
-        serio_interrupt(apf9328keyboard_port, gBuffer, 0, 0); //UNCOMMENT THIS ONLY WHEN DATA ARE OK !!
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
+        serio_interrupt(apf9328keyboard_port, gBuffer, 0, 0);
+#else
+	serio_interrupt(apf9328keyboard_port, gBuffer, 0);
+#endif
     }
     // Trigger timer again
     read_timer.expires = jiffies + HZ/20; // Schedule next interrupt in 50 msec


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.