include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[safe/jmp/linux-2.6] / drivers / hid / hid-stantum.c

diff --git a/drivers/hid/hid-stantum.c b/drivers/hid/hid-stantum.c
index add965d..90df886 100644 (file)
--- a/drivers/hid/hid-stantum.c
+++ b/drivers/hid/hid-stantum.c
@@ -15,8 +15,8 @@
 #include <linux/device.h>
 #include <linux/hid.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 
-MODULE_VERSION("0.6");
 MODULE_AUTHOR("Stephane Chatty <chatty@enac.fr>");
 MODULE_DESCRIPTION("Stantum HID multitouch panels");
 MODULE_LICENSE("GPL");
@@ -66,7 +66,6 @@ static int stantum_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                case HID_DG_DEVICEINDEX:
                case HID_DG_CONTACTCOUNT:
                case HID_DG_CONTACTMAX:
-               case HID_DG_TIPPRESSURE:
                        return -1;
 
                case HID_DG_TIPSWITCH:
@@ -84,6 +83,11 @@ static int stantum_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                        input_set_abs_params(hi->input, ABS_MT_ORIENTATION,
                                        1, 1, 0, 0);
                        return 1;
+               case HID_DG_TIPPRESSURE:
+                       hid_map_usage(hi, usage, bit, max,
+                                       EV_ABS, ABS_MT_PRESSURE);
+                       return 1;
+
                case HID_DG_CONTACTID:
                        hid_map_usage(hi, usage, bit, max,
                                        EV_ABS, ABS_MT_TRACKING_ID);
@@ -140,14 +144,10 @@ static void stantum_filter_event(struct stantum_data *sd,
        input_event(input, EV_ABS, ABS_MT_TOUCH_MAJOR, wide ? sd->w : sd->h);
        input_event(input, EV_ABS, ABS_MT_TOUCH_MINOR, wide ? sd->h : sd->w);
 
-#if 0
-       /* MT_PRESSURE does not exist yet */
        input_event(input, EV_ABS, ABS_MT_PRESSURE, sd->z);
-#endif
 
        input_mt_sync(input);
        sd->valid = false;
-       sd->first = false;
 
        /* touchscreen emulation */
        if (sd->first) {
@@ -158,6 +158,7 @@ static void stantum_filter_event(struct stantum_data *sd,
                input_event(input, EV_ABS, ABS_X, sd->x);
                input_event(input, EV_ABS, ABS_Y, sd->y);
        }
+       sd->first = false;
 }