Merge 3.8-rc5 into staging-next

[firefly-linux-kernel-4.4.55.git] / drivers / staging / sb105x / sb_pci_mp.c

diff --git a/drivers/staging/sb105x/sb_pci_mp.c b/drivers/staging/sb105x/sb_pci_mp.c
index 3da44dff24bfbea43943d8498c2df6bff5f06e33..f75ee1dd475c6e1b9ead392a1e43e5ea6177747b 100644 (file)
--- a/drivers/staging/sb105x/sb_pci_mp.c
+++ b/drivers/staging/sb105x/sb_pci_mp.c
@@ -3048,7 +3048,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
+#ifdef CONFIG_PARPORT_PC
                case PCI_DEVICE_ID_MP2S1P :
                        sbdev->nr_ports = 2;