diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
| commit | 02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch) | |
| tree | 04ef573cd4de095c500c9fc3477f4278c0b36300 /drivers/input/mouse/lifebook.h | |
| parent | 7487a2245b8841c77ba9db406cf99a483b9334e9 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/input/mouse/lifebook.h')
| -rw-r--r-- | drivers/input/mouse/lifebook.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/input/mouse/lifebook.h b/drivers/input/mouse/lifebook.h index be1c0943825d..c1647cf036c2 100644 --- a/drivers/input/mouse/lifebook.h +++ b/drivers/input/mouse/lifebook.h | |||
| @@ -11,7 +11,18 @@ | |||
| 11 | #ifndef _LIFEBOOK_H | 11 | #ifndef _LIFEBOOK_H |
| 12 | #define _LIFEBOOK_H | 12 | #define _LIFEBOOK_H |
| 13 | 13 | ||
| 14 | #ifdef CONFIG_MOUSE_PS2_LIFEBOOK | ||
| 14 | int lifebook_detect(struct psmouse *psmouse, int set_properties); | 15 | int lifebook_detect(struct psmouse *psmouse, int set_properties); |
| 15 | int lifebook_init(struct psmouse *psmouse); | 16 | int lifebook_init(struct psmouse *psmouse); |
| 17 | #else | ||
| 18 | inline int lifebook_detect(struct psmouse *psmouse, int set_properties) | ||
| 19 | { | ||
| 20 | return -ENOSYS; | ||
| 21 | } | ||
| 22 | inline int lifebook_init(struct psmouse *psmouse) | ||
| 23 | { | ||
| 24 | return -ENOSYS; | ||
| 25 | } | ||
| 26 | #endif | ||
| 16 | 27 | ||
| 17 | #endif | 28 | #endif |