Skip to content

Commit

Permalink
staging: Enable parport sb105x drivers if parport is configured
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Steven Rostedt authored and Greg Kroah-Hartman committed Jan 7, 2013
1 parent db21031 commit b1255fb
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/staging/sb105x/sb_pci_mp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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);
Expand Down

0 comments on commit b1255fb

Please sign in to comment.