diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-10 18:54:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-10 18:54:41 -0400 |
| commit | 7f93220b624de1b7d9fcff8a2cebd6fce7ed4665 (patch) | |
| tree | 5070ec25635008082b47a646d64b4359896c0faa /drivers/input/serio/i8042-ip22io.h | |
| parent | 2b8dfec8c8fa4ba5bc946a602e94e99861462cad (diff) | |
| parent | d39969deee4b541be4ee5789a2e4c14511c886e2 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
Diffstat (limited to 'drivers/input/serio/i8042-ip22io.h')
| -rw-r--r-- | drivers/input/serio/i8042-ip22io.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/i8042-ip22io.h b/drivers/input/serio/i8042-ip22io.h index 863b9c95fbb8..ee1ad27d6ed0 100644 --- a/drivers/input/serio/i8042-ip22io.h +++ b/drivers/input/serio/i8042-ip22io.h | |||
| @@ -58,7 +58,7 @@ static inline int i8042_platform_init(void) | |||
| 58 | #if 0 | 58 | #if 0 |
| 59 | /* XXX sgi_kh is a virtual address */ | 59 | /* XXX sgi_kh is a virtual address */ |
| 60 | if (!request_mem_region(sgi_kh, sizeof(struct hpc_keyb), "i8042")) | 60 | if (!request_mem_region(sgi_kh, sizeof(struct hpc_keyb), "i8042")) |
| 61 | return 1; | 61 | return -EBUSY; |
| 62 | #endif | 62 | #endif |
| 63 | 63 | ||
| 64 | i8042_reset = 1; | 64 | i8042_reset = 1; |