Update of /cvsroot/linux-mips/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv13160/drivers/char
Modified Files:
serial.c
Log Message:
Do something with the M5457 on the DDB4131.
Index: serial.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/serial.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- serial.c 21 Apr 2002 20:01:14 -0000 1.12
+++ serial.c 31 May 2002 17:22:50 -0000 1.13
@@ -4172,10 +4172,6 @@
if (!enable) /* is there something to deinit? */
return(0);
-#ifdef SERIAL_DEBUG_PCI
- printk(KERN_DEBUG " Subsystem ID %lx (intel 960)\n",
- (unsigned long) board->subdevice);
-#endif
/* is firmware started? */
pci_read_config_dword(dev, 0x44, (void*) &oldval);
if (oldval == 0x00001000L) { /* RESET value */
@@ -4887,6 +4883,9 @@
0xFF00, 0, 0, 0,
pbn_sgi_ioc3 },
+ { PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M5457,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, pbn_b0_1_115200 },
+
#ifdef CONFIG_DDB5074
/*
* NEC Vrc-5074 (Nile 4) builtin UART.
@@ -5509,7 +5508,7 @@
&& (state->port != 0 || state->iomem_base != 0))
state->irq = detect_uart_irq(state);
if (state->io_type == SERIAL_IO_MEM) {
- printk(KERN_INFO"ttyS%02d%s at 0x%px (irq = %d) is a %s\n",
+ printk(KERN_INFO"ttyS%02d%s at 0x%p (irq = %d) is a %s\n",
state->line + SERIAL_DEV_OFFSET,
(state->flags & ASYNC_FOURPORT) ? " FourPort" : "",
state->iomem_base, state->irq,
|
