Merge branch 'master' into upstream

[linux-2.6] / drivers / ata / pata_it8172.c

diff --git a/drivers/ata/pata_it8172.c b/drivers/ata/pata_it8172.c
index f8367191fc7b62e09d9f34245a5c61edbffc848f..53d35bb6fcf9c1bbcc88e9b839b8ab08767ddcb8 100644 (file)
--- a/drivers/ata/pata_it8172.c
+++ b/drivers/ata/pata_it8172.c
@@ -58,7 +58,7 @@ static int it8172_pre_reset(struct ata_port *ap)
        };
 
        struct pci_dev *pdev = to_pci_dev(ap->host->dev);
-       
+
        if (ap->port_no && !pci_test_config_bits(pdev, &it8172_enable_bits[ap->port_no])) {
                ata_port_disable(ap);
                printk(KERN_INFO "ata%u: port disabled. ignoring.\n", ap->id);