summaryrefslogtreecommitdiffstats
path: root/drivers/input/serio/i8042-ip22io.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-09-14 08:12:20 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-09-14 08:12:20 -0400
commit165415f700b0c77fa1f8db6198f48582639adf78 (patch)
tree088e305b0b5b0c6753072e13be1177824c3ed59d /drivers/input/serio/i8042-ip22io.h
parentc324b44c34050cf2a9b58830e11c974806bd85d8 (diff)
parent2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff)
downloadop-kernel-dev-165415f700b0c77fa1f8db6198f48582639adf78.zip
op-kernel-dev-165415f700b0c77fa1f8db6198f48582639adf78.tar.gz
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 863b9c9..ee1ad27 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;
OpenPOWER on IntegriCloud