IDE fixes
PATCH 1/1 IDE fixes
Hopefully the last update for 2.6.21.
Please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git/
to receive the following updates:
drivers/ide/Kconfig | 1 + drivers/ide/pci/delkin_cb.c | 1 + drivers/ide/pci/hpt366.c | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-)
Bartlomiej Zolnierkiewicz (1):
ide/Kconfig: add missing range check for IDE_MAX_HWIFS
Mark Lord (1):
ide/pci/delkin_cb.c: add new PCI ID
Sergei Shtylyov (1):
hpt366: fix kernel oops with HPT302N
drivers/ide/Kconfig +1 -0
@@ -57,6 +57,7 @@ if IDE config IDE_MAX_HWIFS int "Max IDE interfaces" depends on ALPHA || SUPERH || IA64 || EMBEDDED + range 1 10 default 4 help This is the maximum number of IDE hardware interfaces that will
drivers/ide/pci/delkin_cb.c +1 -0
@@ -108,6 +108,7 @@ delkin_cb_remove (struct pci_dev *dev)static struct pci_device_id delkin_cb_pci_tbl[]__devinitdata = { {0x1145 ,0xf021 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, + {0x1145 ,0xf024 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, {0 , }, };MODULE_DEVICE_TABLE (pci, delkin_cb_pci_tbl);
drivers/ide/pci/hpt366.c +3 -2
@@ -1,10 +1,10 @@/* -* linux/drivers/ide/pci/hpt366.c Version 1.01 Dec 23, 2006 +* linux/drivers/ide/pci/hpt366.c Version 1.02 Apr 18, 2007 * * Copyright (C) 1999-2003 Andre Hedrick <[email protected]> * Portions Copyright (C) 2001 Sun Microsystems, Inc. * Portions Copyright (C) 2003 Red Hat Inc -* Portions Copyright (C) 2005-2006 MontaVista Software, Inc. +* Portions Copyright (C) 2005-2007 MontaVista Software, Inc. * * Thanks to HighPoint Technologies for their assistance, and hardware. * Special Thanks to Jon Burchmore in SanDiego for the deep pockets, his
@@ -494,6 +494,7 @@ static struct hpt_info hpt302n __devinitdata = { .chip_type = HPT302N, .max_mode = HPT302_ALLOW_ATA133_6 ? 4 : 3, .dpll_clk = 77, + .settings = hpt37x_settings };static struct hpt_info hpt371n__devinitdata = {