These two fixes were triggered by a warning printed by ahci on an (outdated) ThinkPad X41. The first one silences that warning on ICH6-M and ICH6R when running in "combined mode" (which disables ahci support). The second one makes sure that ahci will only attach for ICH6-M if it's running in SATA mode. Tested on top of v3.13-rc4. Paul Bolle (2): ahci: bail out on ICH6 before using AHCI BAR ahci: only attach ICH6-M if it's in SATA mode drivers/ata/ahci.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) -- 1.8.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html