git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
input
/
serio
/
gscps2.c
diff --git
a/drivers/input/serio/gscps2.c
b/drivers/input/serio/gscps2.c
index
c0b1e4b
..
a7b0de0
100644
(file)
--- a/
drivers/input/serio/gscps2.c
+++ b/
drivers/input/serio/gscps2.c
@@
-1,7
+1,7
@@
/*
* drivers/input/serio/gscps2.c
*
/*
* drivers/input/serio/gscps2.c
*
- * Copyright (c) 2004
-2006
Helge Deller <deller@gmx.de>
+ * Copyright (c) 2004 Helge Deller <deller@gmx.de>
* Copyright (c) 2002 Laurent Canet <canetl@esiee.fr>
* Copyright (c) 2002 Thibaut Varene <varenet@parisc-linux.org>
*
* Copyright (c) 2002 Laurent Canet <canetl@esiee.fr>
* Copyright (c) 2002 Thibaut Varene <varenet@parisc-linux.org>
*
@@
-354,7
+354,7
@@
static int __init gscps2_probe(struct parisc_device *dev)
memset(serio, 0, sizeof(struct serio));
ps2port->port = serio;
ps2port->padev = dev;
memset(serio, 0, sizeof(struct serio));
ps2port->port = serio;
ps2port->padev = dev;
- ps2port->addr = ioremap
_nocache
(hpa, GSC_STATUS + 4);
+ ps2port->addr = ioremap(hpa, GSC_STATUS + 4);
spin_lock_init(&ps2port->lock);
gscps2_reset(ps2port);
spin_lock_init(&ps2port->lock);
gscps2_reset(ps2port);