summaryrefslogtreecommitdiffstats
path: root/drivers/input/serio/i8042-ip22io.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-09-14 14:19:08 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-09-14 14:19:08 +0200
commit905ec87e93bc9e01b15c60035cd6a50c636cbaef (patch)
tree46fd7618d6511611ffc19eb0dd4d7bc6b90a41c2 /drivers/input/serio/i8042-ip22io.h
parentMerge /spare/repo/linux-2.6/ (diff)
parentLinux 2.6.14-rc1 (diff)
downloadlinux-905ec87e93bc9e01b15c60035cd6a50c636cbaef.tar.xz
linux-905ec87e93bc9e01b15c60035cd6a50c636cbaef.zip
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/input/serio/i8042-ip22io.h')
-rw-r--r--drivers/input/serio/i8042-ip22io.h2
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)
#if 0
/* XXX sgi_kh is a virtual address */
if (!request_mem_region(sgi_kh, sizeof(struct hpc_keyb), "i8042"))
- return 1;
+ return -EBUSY;
#endif
i8042_reset = 1;