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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[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
..
ebd9976
100644
(file)
--- a/
drivers/input/serio/sa1111ps2.c
+++ b/
drivers/input/serio/sa1111ps2.c
@@
-20,7
+20,6
@@
#include <linux/spinlock.h>
#include <asm/io.h>
#include <linux/spinlock.h>
#include <asm/io.h>
-#include <asm/irq.h>
#include <asm/system.h>
#include <asm/hardware/sa1111.h>
#include <asm/system.h>
#include <asm/hardware/sa1111.h>
@@
-28,7
+27,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;
@@
-245,7
+244,7
@@
static int ps2_probe(struct sa1111_dev *dev)
memset(ps2if, 0, sizeof(struct ps2if));
memset(serio, 0, sizeof(struct serio));
memset(ps2if, 0, sizeof(struct ps2if));
memset(serio, 0, sizeof(struct serio));
- serio->
type
= SERIO_8042;
+ serio->
id.type
= SERIO_8042;
serio->write = ps2_write;
serio->open = ps2_open;
serio->close = ps2_close;
serio->write = ps2_write;
serio->open = ps2_open;
serio->close = ps2_close;
@@
-272,7
+271,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);