Merge branch 'linux-2.6' into for-linus

[linux-2.6] / drivers / ide / pci / alim15x3.c

diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index ecaab54149871e6edf8e4063fcced1be370b009b..d419e4bb54f4454e965aacbc32d1f7a902f62fdb 100644 (file)
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -27,7 +27,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -731,6 +730,8 @@ static unsigned int __devinit ata66_ali15x3 (ide_hwif_t *hwif)
        
        if(m5229_revision <= 0x20)
                tmpbyte = (tmpbyte & (~0x02)) | 0x01;
+       else if (m5229_revision == 0xc7 || m5229_revision == 0xc8)
+               tmpbyte |= 0x03;
        else
                tmpbyte |= 0x01;
 
@@ -884,7 +885,7 @@ static int __devinit alim15x3_init_one(struct pci_dev *dev, const struct pci_dev
        ide_pci_device_t *d = &ali15x3_chipset;
 
        if (pci_dev_present(ati_rs100))
-               printk(KERN_ERR "Warning: ATI Radeon IGP Northbridge is not yet fully tested.\n");
+               printk(KERN_WARNING "alim15x3: ATI Radeon IGP Northbridge is not yet fully tested.\n");
 
 #if defined(CONFIG_SPARC64)
        d->init_hwif = init_hwif_common_ali15x3;