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
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
input
/
serio
/
sa1111ps2.c
diff --git
a/drivers/input/serio/sa1111ps2.c
b/drivers/input/serio/sa1111ps2.c
index
62937f5
..
6c68286
100644
(file)
--- a/
drivers/input/serio/sa1111ps2.c
+++ b/
drivers/input/serio/sa1111ps2.c
@@
-28,7
+28,7
@@
struct ps2if {
struct serio *io;
struct sa1111_dev *dev;
struct ps2if {
struct serio *io;
struct sa1111_dev *dev;
-
unsigned long
base;
+
void __iomem *
base;
unsigned int open;
spinlock_t lock;
unsigned int head;
unsigned int open;
spinlock_t lock;
unsigned int head;
@@
-272,7
+272,7
@@
static int ps2_probe(struct sa1111_dev *dev)
/*
* Our parent device has already mapped the region.
*/
/*
* Our parent device has already mapped the region.
*/
- ps2if->base =
(unsigned long)
dev->mapbase;
+ ps2if->base = dev->mapbase;
sa1111_enable_device(ps2if->dev);
sa1111_enable_device(ps2if->dev);