Hi all,
Today's linux-next merge of the timers tree got a conflict in
drivers/serial/8250.c between commit
b70ac7718579b5cbf3bdd74fd01132d1c91596f4 ("serial: allow 8250 to be used
on sparc") from Linus' tree and commit
d1c115207ad93ecf1140c38c3cef249352433c28 ("serial, 8250: remove NR_IRQ
usage") from the timers tree.
Just overlapping changes. I fixed it up (see below).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/serial/8250.c
index ec39203,356c2a2..0000000
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@@ -3003,15 -3027,11 +3049,15 @@@ static int __init serial8250_init(void
goto out;
platform_device_del(serial8250_isa_devs);
- put_dev:
+ put_dev:
platform_device_put(serial8250_isa_devs);
- unreg_uart_drv:
+ unreg_uart_drv:
+#ifdef CONFIG_SPARC
+ sunserial_unregister_minors(&serial8250_reg, UART_NR);
+#else
uart_unregister_driver(&serial8250_reg);
+#endif
- out:
+ out:
return ret;
}
Attachment:
pgph4roU8KBn4.pgp
Description: PGP signature
