[PATCH] ppc32: Add ppc_sys descriptions for PowerQUICC II devices

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

diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
index bda5b065d03c5d77c1dac5121aee2fa317c07e00..86691cf43433f182e9c2d7ac0d3f925dab5bb5bb 100644 (file)
--- a/drivers/input/mouse/psmouse.h
+++ b/drivers/input/mouse/psmouse.h
@@ -77,6 +77,8 @@ enum psmouse_type {
        PSMOUSE_IMEX,
        PSMOUSE_SYNAPTICS,
        PSMOUSE_ALPS,
+       PSMOUSE_LIFEBOOK,
+       PSMOUSE_AUTO            /* This one should always be last */
 };
 
 int psmouse_sliced_command(struct psmouse *psmouse, unsigned char command);
@@ -91,15 +93,15 @@ ssize_t psmouse_attr_set_helper(struct device *dev, const char *buf, size_t coun
 #define PSMOUSE_DEFINE_ATTR(_name)                                             \
 static ssize_t psmouse_attr_show_##_name(struct psmouse *, char *);            \
 static ssize_t psmouse_attr_set_##_name(struct psmouse *, const char *, size_t);\
-static ssize_t psmouse_do_show_##_name(struct device *d, char *b)              \
+static ssize_t psmouse_do_show_##_name(struct device *d, struct device_attribute *attr, char *b)               \
 {                                                                              \
        return psmouse_attr_show_helper(d, b, psmouse_attr_show_##_name);       \
 }                                                                              \
-static ssize_t psmouse_do_set_##_name(struct device *d, const char *b, size_t s)\
+static ssize_t psmouse_do_set_##_name(struct device *d, struct device_attribute *attr, const char *b, size_t s)\
 {                                                                              \
        return psmouse_attr_set_helper(d, b, s, psmouse_attr_set_##_name);      \
 }                                                                              \
-static struct device_attribute psmouse_attr_##_name =                          \
+static struct device_attribute psmouse_attr_##_name =                          \
        __ATTR(_name, S_IWUSR | S_IRUGO,                                        \
                psmouse_do_show_##_name, psmouse_do_set_##_name);