The 2.6.36 tree includes several blocks of code that switch between
different statements depending on if you are compiling a kernel > 2.6.37
or not. Such kernels will not be compiled against the 2.6.36 codebase
though since they'll be directed to the "2.6.38" instead. Note that a
kernel with version e.g. 2.6.37.6 compares as <= 2.6.37 since only the
first three parts of the version are checked.
Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
---
2.6.36/wacom.h | 7 -------
2.6.36/wacom_w8001.c | 10 ----------
2.6.36/wacom_wac.c | 8 --------
3 files changed, 25 deletions(-)
diff --git a/2.6.36/wacom.h b/2.6.36/wacom.h
index 2fd031c..e4ae477 100644
--- a/2.6.36/wacom.h
+++ b/2.6.36/wacom.h
@@ -89,18 +89,11 @@
#include <linux/init.h>
#include <linux/usb/input.h>
#include <linux/input.h>
-# ifndef LINUX_VERSION_CODE
-# include <linux/version.h>
-# endif
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,37)
-#include <linux/input/mt.h>
-#else
static inline int input_mt_get_value(const struct input_mt_slot *slot,
unsigned code)
{
return slot->abs[code - ABS_MT_FIRST];
}
-#endif
#include <asm/unaligned.h>
/*
diff --git a/2.6.36/wacom_w8001.c b/2.6.36/wacom_w8001.c
index f5defe9..f87ad7b 100755
--- a/2.6.36/wacom_w8001.c
+++ b/2.6.36/wacom_w8001.c
@@ -21,12 +21,6 @@
#include <linux/init.h>
#include <linux/ctype.h>
#include <linux/delay.h>
-# ifndef LINUX_VERSION_CODE
-# include <linux/version.h>
-# endif
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,37)
-#include <linux/input/mt.h>
-#endif
#define DRIVER_DESC "Wacom W8001 serial touchscreen driver"
@@ -447,11 +441,7 @@ static int w8001_setup(struct w8001 *w8001)
case 5:
w8001->pktlen = W8001_PKTLEN_TOUCH2FG;
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,37)
input_mt_create_slots(dev, 2);
-#else
- input_mt_init_slots(dev, 2);
-#endif
input_set_abs_params(dev, ABS_MT_TRACKING_ID,
0, MAX_TRACKING_ID, 0, 0);
input_set_abs_params(dev, ABS_MT_POSITION_X,
diff --git a/2.6.36/wacom_wac.c b/2.6.36/wacom_wac.c
index 3c5369b..6f0b807 100644
--- a/2.6.36/wacom_wac.c
+++ b/2.6.36/wacom_wac.c
@@ -1537,11 +1537,7 @@ void wacom_setup_input_capabilities(struct input_dev
*input_dev,
case TABLETPC2FG:
case MTSCREEN:
if (features->device_type == BTN_TOOL_FINGER) {
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,37)
input_mt_create_slots(input_dev, features->touch_max);
-#else
- input_mt_init_slots(input_dev, features->touch_max);
-#endif
input_set_abs_params(input_dev, ABS_MT_POSITION_X,
0, features->x_max, 0, 0);
input_set_abs_params(input_dev, ABS_MT_POSITION_Y,
@@ -1591,11 +1587,7 @@ void wacom_setup_input_capabilities(struct input_dev
*input_dev,
__set_bit(BTN_TOOL_FINGER, input_dev->keybit);
__set_bit(BTN_TOOL_DOUBLETAP, input_dev->keybit);
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,37)
input_mt_create_slots(input_dev, 2);
-#else
- input_mt_init_slots(input_dev, 2);
-#endif
input_set_abs_params(input_dev, ABS_MT_POSITION_X,
0, features->x_max,
features->x_fuzz, 0);
--
2.6.2
------------------------------------------------------------------------------
Go from Idea to Many App Stores Faster with Intel(R) XDK
Give your users amazing mobile app experiences with Intel(R) XDK.
Use one codebase in this all-in-one HTML5 development environment.
Design, debug & build mobile apps & 2D/3D high-impact games for multiple OSs.
http://pubads.g.doubleclick.net/gampad/clk?id=254741911&iu=/4140
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
