tty/serial: Relax the device_type restriction from of_serial

There is no need to test for a device_type property in ns8250
compatible serial ports.  device_type is an OpenFirmware property that
is not required when using the flattened tree representation.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c
index 5c7abe4c94dd4360de8c3ac26b9efd74af4a9867..6a18ca6ddaa9370028a81dd13b5206fb0326ebed 100644 (file)
--- a/drivers/tty/serial/of_serial.c
+++ b/drivers/tty/serial/of_serial.c
@@ -160,17 +160,17 @@ static int of_platform_serial_remove(struct platform_device *ofdev)
  * A few common types, add more as needed.
  */
 static struct of_device_id __devinitdata of_platform_serial_table[] = {
-       { .type = "serial", .compatible = "ns8250",   .data = (void *)PORT_8250, },
-       { .type = "serial", .compatible = "ns16450",  .data = (void *)PORT_16450, },
-       { .type = "serial", .compatible = "ns16550a", .data = (void *)PORT_16550A, },
-       { .type = "serial", .compatible = "ns16550",  .data = (void *)PORT_16550, },
-       { .type = "serial", .compatible = "ns16750",  .data = (void *)PORT_16750, },
-       { .type = "serial", .compatible = "ns16850",  .data = (void *)PORT_16850, },
+       { .compatible = "ns8250",   .data = (void *)PORT_8250, },
+       { .compatible = "ns16450",  .data = (void *)PORT_16450, },
+       { .compatible = "ns16550a", .data = (void *)PORT_16550A, },
+       { .compatible = "ns16550",  .data = (void *)PORT_16550, },
+       { .compatible = "ns16750",  .data = (void *)PORT_16750, },
+       { .compatible = "ns16850",  .data = (void *)PORT_16850, },
 #ifdef CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL
-       { .type = "serial", .compatible = "ibm,qpace-nwp-serial",
-                                       .data = (void *)PORT_NWPSERIAL, },
+       { .compatible = "ibm,qpace-nwp-serial",
+               .data = (void *)PORT_NWPSERIAL, },
 #endif
-       { .type = "serial",                           .data = (void *)PORT_UNKNOWN, },
+       { .type = "serial",         .data = (void *)PORT_UNKNOWN, },
        { /* end of list */ },
 };