apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge 3.8-rc5 into staging-next

Browse Source 
This resolves a merge issue with a iio driver, and the zram code.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2013-01-25 21:25:02 -08:00
parent c0cd2da16b 949db153b6
commit 8f5f90a872
1884 changed files with 18714 additions and 10346 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/staging/sb105x/sb_pci_mp.c
+1 -1
View File
@@ -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;