diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-14 10:57:07 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-14 10:57:07 -0400 |
commit | 1018cf9b0f27646c37a52a079989dc0552b2451c (patch) | |
tree | de2ae50bc8db908b170bd2375ed5b007f416ad93 | |
parent | 533bb8a4d7388686243c37a414c4448ba3566f8a (diff) | |
parent | 1892225f788a73beae2ec26f6f2fa4cd2e5868d0 (diff) |
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
-rw-r--r-- | drivers/ata/pata_ali.c | 2 | ||||
-rw-r--r-- | drivers/ata/sata_svw.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c index ce830fe3a362..511a830b6256 100644 --- a/drivers/ata/pata_ali.c +++ b/drivers/ata/pata_ali.c | |||
@@ -36,7 +36,7 @@ | |||
36 | #define DRV_NAME "pata_ali" | 36 | #define DRV_NAME "pata_ali" |
37 | #define DRV_VERSION "0.7.5" | 37 | #define DRV_VERSION "0.7.5" |
38 | 38 | ||
39 | int ali_atapi_dma = 0; | 39 | static int ali_atapi_dma = 0; |
40 | module_param_named(atapi_dma, ali_atapi_dma, int, 0644); | 40 | module_param_named(atapi_dma, ali_atapi_dma, int, 0644); |
41 | MODULE_PARM_DESC(atapi_dma, "Enable ATAPI DMA (0=disable, 1=enable)"); | 41 | MODULE_PARM_DESC(atapi_dma, "Enable ATAPI DMA (0=disable, 1=enable)"); |
42 | 42 | ||
diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c index 840d1c4a7850..019e367b59fc 100644 --- a/drivers/ata/sata_svw.c +++ b/drivers/ata/sata_svw.c | |||
@@ -531,8 +531,8 @@ static int k2_sata_init_one(struct pci_dev *pdev, const struct pci_device_id *en | |||
531 | * */ | 531 | * */ |
532 | static const struct pci_device_id k2_sata_pci_tbl[] = { | 532 | static const struct pci_device_id k2_sata_pci_tbl[] = { |
533 | { PCI_VDEVICE(SERVERWORKS, 0x0240), chip_svw4 }, | 533 | { PCI_VDEVICE(SERVERWORKS, 0x0240), chip_svw4 }, |
534 | { PCI_VDEVICE(SERVERWORKS, 0x0241), chip_svw4 }, | 534 | { PCI_VDEVICE(SERVERWORKS, 0x0241), chip_svw8 }, |
535 | { PCI_VDEVICE(SERVERWORKS, 0x0242), chip_svw8 }, | 535 | { PCI_VDEVICE(SERVERWORKS, 0x0242), chip_svw4 }, |
536 | { PCI_VDEVICE(SERVERWORKS, 0x024a), chip_svw4 }, | 536 | { PCI_VDEVICE(SERVERWORKS, 0x024a), chip_svw4 }, |
537 | { PCI_VDEVICE(SERVERWORKS, 0x024b), chip_svw4 }, | 537 | { PCI_VDEVICE(SERVERWORKS, 0x024b), chip_svw4 }, |
538 | { PCI_VDEVICE(SERVERWORKS, 0x0410), chip_svw42 }, | 538 | { PCI_VDEVICE(SERVERWORKS, 0x0410), chip_svw42 }, |