diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/tables.c | 2 | ||||
| -rw-r--r-- | drivers/ata/libata-core.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index 96792a6cc164..c3419182c9a7 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -42,7 +42,7 @@ static char *mps_inti_flags_trigger[] = { "dfl", "edge", "res", "level" }; static struct acpi_table_desc initial_tables[ACPI_MAX_TABLES] __initdata; -static int acpi_apic_instance __initdata = 2; +static int acpi_apic_instance __initdata; void acpi_table_print_madt_entry(struct acpi_subtable_header *header) { diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index f1f595f53d95..ddb3909d7288 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -3361,6 +3361,8 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { { "FUJITSU MHT2060BH", NULL, ATA_HORKAGE_NONCQ }, /* NCQ is broken */ { "Maxtor 6L250S0", "BANC1G10", ATA_HORKAGE_NONCQ }, + /* NCQ hard hangs device under heavier load, needs hard power cycle */ + { "Maxtor 6B250S0", "BANC1B70", ATA_HORKAGE_NONCQ }, /* Devices with NCQ limits */ |
