From f058f991cb761d96628920e69fbefca015917625 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Fri, 11 Jan 2013 20:17:01 -0500 Subject: [PATCH] --- yaml --- r: 348899 b: refs/heads/master c: 7dfc8331781f954bbea5c59d4411acf3b28530c1 h: refs/heads/master i: 348897: 610960c96f1ad24889474568dcf911d0e8fab220 348895: 6d89fae7d00e6eb8da76da5e78ae9e72615fde2d v: v3 --- [refs] | 2 +- trunk/drivers/staging/sb105x/sb_pci_mp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8321c60ab960..60087c30beb3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 811a37effdb11e54e1ff1ddaa944286c88f58487 +refs/heads/master: 7dfc8331781f954bbea5c59d4411acf3b28530c1 diff --git a/trunk/drivers/staging/sb105x/sb_pci_mp.c b/trunk/drivers/staging/sb105x/sb_pci_mp.c index 131afd0c460c..9464f3874346 100644 --- a/trunk/drivers/staging/sb105x/sb_pci_mp.c +++ b/trunk/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;