Commit 1018cf9b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev 

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [libata] make ali_atapi_dma static
  [libata] sata_svw: fix reversed port count
parents 533bb8a4 1892225f

drivers/ata/pata_ali.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#define DRV_NAME "pata_ali"

#define DRV_VERSION "0.7.5"



int ali_atapi_dma = 0;

static int ali_atapi_dma = 0;

module_param_named(atapi_dma, ali_atapi_dma, int, 0644);

MODULE_PARM_DESC(atapi_dma, "Enable ATAPI DMA (0=disable, 1=enable)");

drivers/ata/sata_svw.c

+2 −2
Original line number Diff line number Diff line
@@ -531,8 +531,8 @@ static int k2_sata_init_one(struct pci_dev *pdev, const struct pci_device_id *en 
 * */

static const struct pci_device_id k2_sata_pci_tbl[] = {

	{ PCI_VDEVICE(SERVERWORKS, 0x0240), chip_svw4 },

	{ PCI_VDEVICE(SERVERWORKS, 0x0241), chip_svw4 },

	{ PCI_VDEVICE(SERVERWORKS, 0x0242), chip_svw8 },

	{ PCI_VDEVICE(SERVERWORKS, 0x0241), chip_svw8 },

	{ PCI_VDEVICE(SERVERWORKS, 0x0242), chip_svw4 },

	{ PCI_VDEVICE(SERVERWORKS, 0x024a), chip_svw4 },

	{ PCI_VDEVICE(SERVERWORKS, 0x024b), chip_svw4 },

	{ PCI_VDEVICE(SERVERWORKS, 0x0410), chip_svw42 },