diff options
| author | Anton Altaparmakov <aia21@hera.kernel.org> | 2005-09-09 08:19:10 -0700 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@hera.kernel.org> | 2005-09-09 08:19:10 -0700 |
| commit | ddcc95963449d028b16d9b9fe50f6e91ce7d9e81 (patch) | |
| tree | aaf0392346a18b3e232ddeb5db3c4e917f7ca686 /drivers/scsi/ahci.c | |
| parent | 223176bc722a7bf519904180e956292ae1d1e819 (diff) | |
| parent | 5f5024130287a9467a41b9f94ec170958ae45cbd (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/scsi/ahci.c')
| -rw-r--r-- | drivers/scsi/ahci.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c index 320df6cd3de..c2c8fa828e2 100644 --- a/drivers/scsi/ahci.c +++ b/drivers/scsi/ahci.c @@ -865,22 +865,6 @@ static int ahci_host_init(struct ata_probe_ent *probe_ent) return 0; } -/* move to PCI layer, integrate w/ MSI stuff */ -static void pci_intx(struct pci_dev *pdev, int enable) -{ - u16 pci_command, new; - - pci_read_config_word(pdev, PCI_COMMAND, &pci_command); - - if (enable) - new = pci_command & ~PCI_COMMAND_INTX_DISABLE; - else - new = pci_command | PCI_COMMAND_INTX_DISABLE; - - if (new != pci_command) - pci_write_config_word(pdev, PCI_COMMAND, pci_command); -} - static void ahci_print_info(struct ata_probe_ent *probe_ent) { struct ahci_host_priv *hpriv = probe_ent->private_data; |