Merge branch 'linux-2.6'

[linux-2.6-omap-h63xx.git] / drivers / input / mouse / alps.h

diff --git a/drivers/input/mouse/alps.h b/drivers/input/mouse/alps.h
index aba103dd65b79a64672b82d6f6929530c0c558d6..4bbddc99962b37d4a1c3869b5d77611a3123b0b7 100644 (file)
--- a/drivers/input/mouse/alps.h
+++ b/drivers/input/mouse/alps.h
@@ -12,9 +12,6 @@
 #ifndef _ALPS_H
 #define _ALPS_H
 
-int alps_detect(struct psmouse *psmouse, int set_properties);
-int alps_init(struct psmouse *psmouse);
-
 struct alps_model_info {
         unsigned char signature[3];
         unsigned char byte0, mask0;
@@ -22,11 +19,24 @@ struct alps_model_info {
 };
 
 struct alps_data {
-       struct input_dev dev2;          /* Relative device */
-       char name[32];                  /* Name */
+       struct input_dev *dev2;         /* Relative device */
        char phys[32];                  /* Phys */
-       struct alps_model_info *i;      /* Info */
+       const struct alps_model_info *i;/* Info */
        int prev_fin;                   /* Finger bit from previous packet */
 };
 
+#ifdef CONFIG_MOUSE_PS2_ALPS
+int alps_detect(struct psmouse *psmouse, int set_properties);
+int alps_init(struct psmouse *psmouse);
+#else
+inline int alps_detect(struct psmouse *psmouse, int set_properties)
+{
+       return -ENOSYS;
+}
+inline int alps_init(struct psmouse *psmouse)
+{
+       return -ENOSYS;
+}
+#endif /* CONFIG_MOUSE_PS2_ALPS */
+
 #endif