Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

[safe/jmp/linux-2.6] / drivers / input / mouse / psmouse.h

diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
index 45d2bd7..7c4192b 100644 (file)
--- a/drivers/input/mouse/psmouse.h
+++ b/drivers/input/mouse/psmouse.h
@@ -36,7 +36,7 @@ typedef enum {
 
 struct psmouse {
        void *private;
-       struct input_dev dev;
+       struct input_dev *dev;
        struct ps2dev ps2dev;
        char *vendor;
        char *name;