projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'omap/multiplatform-fixes', tag 'v3.8-rc5' into next/multiplatform
[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 131afd0c460c3ba2f82f7beb68d11c75b59cbbaa..9464f3874346eb141f115c65752b9bbe41fc4c7d 100644
(file)
--- a/
drivers/staging/sb105x/sb_pci_mp.c
+++ b/
drivers/staging/sb105x/sb_pci_mp.c
@@
-3054,7
+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
+#ifdef CONFIG_PARPORT
_PC
case PCI_DEVICE_ID_MP2S1P :
sbdev->nr_ports = 2;