git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
drivers
/
input
/
serio
/
i8042-ip22io.h
diff --git
a/drivers/input/serio/i8042-ip22io.h
b/drivers/input/serio/i8042-ip22io.h
index
863b9c9
..
ee1ad27
100644
(file)
--- 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;