> diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.24-rc2-mm1/drivers/serial/8250_gsc.c linux-2.6.24-rc2-mm1/drivers/serial/8250_gsc.c
> --- linux.vanilla-2.6.24-rc2-mm1/drivers/serial/8250_gsc.c 2007-11-16 17:20:48.000000000 +0000
> +++ linux-2.6.24-rc2-mm1/drivers/serial/8250_gsc.c 2007-11-16 18:35:39.000000000 +0000
> @@ -25,8 +25,7 @@
>
> #include "8250.h"
>
> -static int __init
> -serial_init_chip(struct parisc_device *dev)
> +static int __init serial_init_chip(struct parisc_device *dev)
> {
> struct uart_port port;
> unsigned long address;
> @@ -38,18 +37,17 @@
> * what we have here is a missing parent device, so tell
> * the user what they're missing.
> */
> - if (parisc_parent(dev)->id.hw_type != HPHW_IOA) {
> - printk(KERN_INFO "Serial: device 0x%lx not configured.\n"
> + if (parisc_parent(dev)->id.hw_type != HPHW_IOA)
> + printk(KERN_INFO
> + "Serial: device 0x%lx not configured.\n"
> "Enable support for Wax, Lasi, Asp or Dino.\n",
> dev->hpa.start);
> - }
> return -ENODEV;
> }
>
> address = dev->hpa.start;
> - if (dev->id.sversion != 0x8d) {
> + if (dev->id.sversion != 0x8d)
> address += 0x800;
> - }
>
> memset(&port, 0, sizeof(port));
> port.iotype = UPIO_MEM;
> @@ -63,11 +61,12 @@
>
> err = serial8250_register_port(&port);
> if (err < 0) {
> - printk(KERN_WARNING "serial8250_register_port returned error %d\n", err);
> + printk(KERN_WARNING
> + "serial8250_register_port returned error %d\n", err);
> iounmap(port.membase);
> return err;
> }
> -
> +
> return 0;
> }
>
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to
majordomo@vger.kernel.org
> More majordomo info at
http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at
http://www.tux.org/lkml/
