#include <linux/spinlock.h>
#include <asm/io.h>
-#include <asm/irq.h>
#include <asm/system.h>
#include <asm/hardware/sa1111.h>
struct ps2if {
struct serio *io;
struct sa1111_dev *dev;
- unsigned long base;
+ void __iomem *base;
unsigned int open;
spinlock_t lock;
unsigned int head;
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;
/*
* Our parent device has already mapped the region.
*/
- ps2if->base = (unsigned long)dev->mapbase;
+ ps2if->base = dev->mapbase;
sa1111_enable_device(ps2if->dev);