diff options
| author | Greg Kroah-Hartman | 2013-01-26 06:25:02 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-01-26 06:25:02 +0100 |
| commit | 8f5f90a872c38b4e78f3cc95e8a25434b98e4db2 (patch) | |
| tree | 36c50b0c97286ab89c85016f7ab281f8e843c05c /drivers/staging/sb105x | |
| parent | staging: comedi: addi_watchdog: all i/o registers are 32-bit (diff) | |
| parent | Linux 3.8-rc5 (diff) | |
| download | kernel-qcow2-linux-8f5f90a872c38b4e78f3cc95e8a25434b98e4db2.tar.gz kernel-qcow2-linux-8f5f90a872c38b4e78f3cc95e8a25434b98e4db2.tar.xz kernel-qcow2-linux-8f5f90a872c38b4e78f3cc95e8a25434b98e4db2.zip | |
Merge 3.8-rc5 into staging-next
This resolves a merge issue with a iio driver, and the zram code.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/sb105x')
| -rw-r--r-- | drivers/staging/sb105x/sb_pci_mp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/sb105x/sb_pci_mp.c b/drivers/staging/sb105x/sb_pci_mp.c index 3da44dff24bf..f75ee1dd475c 100644 --- 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; |