Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	arch/x86/kernel/io_apic.c

1 files changed, 6 insertions, 8 deletions

diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c
index 2014253f6c88..b173c157ab00 100644
--- a/drivers/ata/pata_ixp4xx_cf.c
+++ b/drivers/ata/pata_ixp4xx_cf.c
@@ -30,14 +30,12 @@ static int ixp4xx_set_mode(struct ata_link *link, struct ata_device **error)
 {
         struct ata_device *dev;
 
-        ata_link_for_each_dev(dev, link) {
-                if (ata_dev_enabled(dev)) {
-                        ata_dev_printk(dev, KERN_INFO, "configured for PIO0\n");
-                        dev->pio_mode = XFER_PIO_0;
-                        dev->xfer_mode = XFER_PIO_0;
-                        dev->xfer_shift = ATA_SHIFT_PIO;
-                        dev->flags |= ATA_DFLAG_PIO;
-                }
+        ata_for_each_dev(dev, link, ENABLED) {
+                ata_dev_printk(dev, KERN_INFO, "configured for PIO0\n");
+                dev->pio_mode = XFER_PIO_0;
+                dev->xfer_mode = XFER_PIO_0;
+                dev->xfer_shift = ATA_SHIFT_PIO;
+                dev->flags |= ATA_DFLAG_PIO;
         }
         return 0;
 }