X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Finput%2Fserio%2Fsa1111ps2.c;h=6c68286c7736ebe085e7648649cc3c8c836046ed;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=62937f5b3e57e24b01a022d533feb47a3b787fcf;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git diff --git a/drivers/input/serio/sa1111ps2.c b/drivers/input/serio/sa1111ps2.c index 62937f5b3..6c68286c7 100644 --- 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; - unsigned long base; + void __iomem *base; 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. */ - ps2if->base = (unsigned long)dev->mapbase; + ps2if->base = dev->mapbase; sa1111_enable_device(ps2if->dev);