summaryrefslogtreecommitdiffstats
path: root/drivers/staging/sb105x
diff options
context:
space:
mode:
authorSteven Rostedt <rostedt@goodmis.org>2012-12-14 11:45:42 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-07 09:32:46 -0800
commitb1255fb989e1d11295cd7e530848b6a05baa9331 (patch)
tree4e64468d7b18e3664cb2be2f02b41a56be5933d5 /drivers/staging/sb105x
parentdb210312f77b8e0e3652bbbaafe879c24c8ba604 (diff)
downloadblackbird-op-linux-b1255fb989e1d11295cd7e530848b6a05baa9331.tar.gz
blackbird-op-linux-b1255fb989e1d11295cd7e530848b6a05baa9331.zip
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: Wu Fengguang <fengguang.wu@intel.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/sb105x')
-rw-r--r--drivers/staging/sb105x/sb_pci_mp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/sb105x/sb_pci_mp.c b/drivers/staging/sb105x/sb_pci_mp.c
index edb2a85b9d52..131afd0c460c 100644
--- a/drivers/staging/sb105x/sb_pci_mp.c
+++ b/drivers/staging/sb105x/sb_pci_mp.c
@@ -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);
}
break;
+#ifdef CONFIG_PARPORT
case PCI_DEVICE_ID_MP2S1P :
sbdev->nr_ports = 2;
@@ -3073,6 +3074,7 @@ static int init_mp_dev(struct pci_dev *pcidev, mppcibrd_t brd)
/* 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);
break;
+#endif
}
ret = request_region(sbdev->uart_access_addr, (8*sbdev->nr_ports), sbdev->name);
OpenPOWER on IntegriCloud