Commit d6f75078 authored by Russell King's avatar Russell King

[SERIAL] Export pci_siig10x_fn() and pci_siig20x_fn()

Patch from Zwane Mwaikambo, fixed by rmk, comments by rmk.

SIIG cards have parallel ports in addition to serial ports.  We therefore
probe the cards in parport_serial.c and call the serial specific probe
functions in 8250_pci.c

This is the second half of a patch that was applied in 2.5.50 to
parport_serial by others without the corresponding 8250_pci.c changes.
parent 1d680b7a
......@@ -262,12 +262,14 @@ static int __devinit pci_plx9050_fn(struct pci_dev *dev, int enable)
* interface chip and different configuration methods:
* - 10x cards have control registers in IO and/or memory space;
* - 20x cards have control registers in standard PCI configuration space.
*
* Note: some SIIG cards are probed by the parport_serial object.
*/
#define PCI_DEVICE_ID_SIIG_1S_10x (PCI_DEVICE_ID_SIIG_1S_10x_550 & 0xfffc)
#define PCI_DEVICE_ID_SIIG_2S_10x (PCI_DEVICE_ID_SIIG_2S_10x_550 & 0xfff8)
static int __devinit pci_siig10x_fn(struct pci_dev *dev, int enable)
int pci_siig10x_fn(struct pci_dev *dev, int enable)
{
u16 data, *p;
......@@ -295,10 +297,12 @@ static int __devinit pci_siig10x_fn(struct pci_dev *dev, int enable)
return 0;
}
EXPORT_SYMBOL(pci_siig10x_fn);
#define PCI_DEVICE_ID_SIIG_2S_20x (PCI_DEVICE_ID_SIIG_2S_20x_550 & 0xfffc)
#define PCI_DEVICE_ID_SIIG_2S1P_20x (PCI_DEVICE_ID_SIIG_2S1P_20x_550 & 0xfffc)
static int __devinit pci_siig20x_fn(struct pci_dev *dev, int enable)
int pci_siig20x_fn(struct pci_dev *dev, int enable)
{
u8 data;
......@@ -318,6 +322,8 @@ static int __devinit pci_siig20x_fn(struct pci_dev *dev, int enable)
return 0;
}
EXPORT_SYMBOL(pci_siig20x_fn);
/* Added for EKF Intel i960 serial boards */
static int __devinit pci_inteli960ni_fn(struct pci_dev *dev, int enable)
{
......
......@@ -4,7 +4,7 @@
# $Id: Makefile,v 1.8 2002/07/21 21:32:30 rmk Exp $
#
export-objs := core.o 8250.o suncore.o
export-objs := core.o 8250.o 8250_pci.o suncore.o
serial-8250-y :=
serial-8250-$(CONFIG_GSC) += 8250_gsc.o
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment