Commit b1255fb9 authored by Steven Rostedt's avatar Steven Rostedt Committed by Greg Kroah-Hartman

staging: Enable parport sb105x drivers if parport is configured

Some of the drivers that the sb105x SystemBase handles are for parallel
port cards. If PARPORT isn't configured, the build fails. Only
initialize the parallel port cards if PARPORT is configured in.
Reported-by: default avatarWu Fengguang <fengguang.wu@intel.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent db210312
...@@ -3054,6 +3054,7 @@ static int init_mp_dev(struct pci_dev *pcidev, mppcibrd_t brd) ...@@ -3054,6 +3054,7 @@ static int init_mp_dev(struct pci_dev *pcidev, mppcibrd_t brd)
sbdev->nr_ports = ((portnum_hex/16)*10) + (portnum_hex % 16); sbdev->nr_ports = ((portnum_hex/16)*10) + (portnum_hex % 16);
} }
break; break;
#ifdef CONFIG_PARPORT
case PCI_DEVICE_ID_MP2S1P : case PCI_DEVICE_ID_MP2S1P :
sbdev->nr_ports = 2; sbdev->nr_ports = 2;
...@@ -3073,6 +3074,7 @@ static int init_mp_dev(struct pci_dev *pcidev, mppcibrd_t brd) ...@@ -3073,6 +3074,7 @@ static int init_mp_dev(struct pci_dev *pcidev, mppcibrd_t brd)
/* add PC compatible parallel port */ /* add PC compatible parallel port */
parport_pc_probe_port(pcidev->resource[2].start, pcidev->resource[3].start, PARPORT_IRQ_NONE, PARPORT_DMA_NONE, &pcidev->dev, 0); parport_pc_probe_port(pcidev->resource[2].start, pcidev->resource[3].start, PARPORT_IRQ_NONE, PARPORT_DMA_NONE, &pcidev->dev, 0);
break; break;
#endif
} }
ret = request_region(sbdev->uart_access_addr, (8*sbdev->nr_ports), sbdev->name); ret = request_region(sbdev->uart_access_addr, (8*sbdev->nr_ports), sbdev->name);
......
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