diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-19 22:45:37 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-19 22:45:37 +0000 |
| commit | 6d403070f28cd44860fdb3a53be5da0275c65cf4 (patch) | |
| tree | 0d0e7fe7b5fb7568d19e11d7d862b77a866ce081 /drivers/acorn/char | |
| parent | ecf1bf5f6c2e668d03b0a9fb026db7aa41e292e1 (diff) | |
Merge with 2.4.0-test1-ac21 + pile of MIPS cleanups to make merging
possible. Chainsawed RM200 kernel to compile again. Jazz machine
status unknown.
Diffstat (limited to 'drivers/acorn/char')
| -rw-r--r-- | drivers/acorn/char/Makefile | 5 | ||||
| -rw-r--r-- | drivers/acorn/char/keyb_arc.c | 2 | ||||
| -rw-r--r-- | drivers/acorn/char/mouse_rpc.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/drivers/acorn/char/Makefile b/drivers/acorn/char/Makefile index 24bab45a9..316af0d4e 100644 --- a/drivers/acorn/char/Makefile +++ b/drivers/acorn/char/Makefile @@ -18,7 +18,7 @@ MX_OBJS := # Object file lists. -obj-y := i2c.o pcf8583.o +obj-y := obj-m := obj-n := obj- := @@ -34,7 +34,8 @@ obj-$(CONFIG_RPCMOUSE) += mouse_rpc.o obj-$(CONFIG_ATOMWIDE_SERIAL) += serial-atomwide.o obj-$(CONFIG_DUALSP_SERIAL) += serial-dualsp.o -obj-y += $(obj-$(MACHINE)) +# Do the i2c and rtc last +obj-y += $(obj-$(MACHINE)) i2c.o pcf8583.o O_OBJS := $(filter-out $(export-objs), $(obj-y)) OX_OBJS := $(filter $(export-objs), $(obj-y)) diff --git a/drivers/acorn/char/keyb_arc.c b/drivers/acorn/char/keyb_arc.c index 44395fd97..4e37bb9d0 100644 --- a/drivers/acorn/char/keyb_arc.c +++ b/drivers/acorn/char/keyb_arc.c @@ -415,7 +415,7 @@ static void a5kkbd_tx(int irq, void *dev_id, struct pt_regs *regs) #ifdef CONFIG_KBDMOUSE static struct busmouse a5kkbd_mouse = { - 6, "kbdmouse", NULL, NULL, 7 + 6, "kbdmouse", NULL, NULL, NULL, 7 }; #endif diff --git a/drivers/acorn/char/mouse_rpc.c b/drivers/acorn/char/mouse_rpc.c index 68b1b9642..fb6e45373 100644 --- a/drivers/acorn/char/mouse_rpc.c +++ b/drivers/acorn/char/mouse_rpc.c @@ -46,7 +46,7 @@ mouse_rpc_irq(int irq, void *dev_id, struct pt_regs *regs) } static struct busmouse rpcmouse = { - 6, "arcmouse", NULL, NULL, 7 + 6, "arcmouse", NULL, NULL, NULL, 7 }; static int __init mouse_rpc_init(void) |