diff options
Diffstat (limited to 'drivers/input/mouse/alps.h')
-rw-r--r-- | drivers/input/mouse/alps.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/drivers/input/mouse/alps.h b/drivers/input/mouse/alps.h index 69db7325a494..f85ac40ec941 100644 --- a/drivers/input/mouse/alps.h +++ b/drivers/input/mouse/alps.h | |||
@@ -12,9 +12,6 @@ | |||
12 | #ifndef _ALPS_H | 12 | #ifndef _ALPS_H |
13 | #define _ALPS_H | 13 | #define _ALPS_H |
14 | 14 | ||
15 | int alps_detect(struct psmouse *psmouse, int set_properties); | ||
16 | int alps_init(struct psmouse *psmouse); | ||
17 | |||
18 | struct alps_model_info { | 15 | struct alps_model_info { |
19 | unsigned char signature[3]; | 16 | unsigned char signature[3]; |
20 | unsigned char byte0, mask0; | 17 | unsigned char byte0, mask0; |
@@ -29,4 +26,18 @@ struct alps_data { | |||
29 | int prev_fin; /* Finger bit from previous packet */ | 26 | int prev_fin; /* Finger bit from previous packet */ |
30 | }; | 27 | }; |
31 | 28 | ||
29 | #ifdef CONFIG_MOUSE_PS2_ALPS | ||
30 | int alps_detect(struct psmouse *psmouse, int set_properties); | ||
31 | int alps_init(struct psmouse *psmouse); | ||
32 | #else | ||
33 | inline int alps_detect(struct psmouse *psmouse, int set_properties) | ||
34 | { | ||
35 | return -ENOSYS; | ||
36 | } | ||
37 | inline int alps_init(struct psmouse *psmouse) | ||
38 | { | ||
39 | return -ENOSYS; | ||
40 | } | ||
41 | #endif /* CONFIG_MOUSE_PS2_ALPS */ | ||
42 | |||
32 | #endif | 43 | #endif |