From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2993322AbXDTUPa (ORCPT ); Fri, 20 Apr 2007 16:15:30 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S2993319AbXDTUPa (ORCPT ); Fri, 20 Apr 2007 16:15:30 -0400 Received: from ug-out-1314.google.com ([66.249.92.171]:35715 "EHLO ug-out-1314.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2993322AbXDTUPR (ORCPT ); Fri, 20 Apr 2007 16:15:17 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:from:to:subject:date:user-agent:cc:mime-version:content-type:content-transfer-encoding:content-disposition:message-id; b=A+w/2ZDkpBj2uq5wee/KjcNCL9jFQQbZ47Vphrf7sruEBdK86Z4Ovjbb0Th3ca9PGNAVd8jcclbwMBSjCSx0V75TunCtuB1+0quWozphY9YS0k7BuqJXstcHDAhGLhn7jmvKeWXmQwqFkPuHL8oneD1iX+u00ZSTVo7IoRZ7SAo= From: Bartlomiej Zolnierkiewicz To: Linus Torvalds Subject: [git patches] IDE fixes Date: Fri, 20 Apr 2007 22:19:30 +0200 User-Agent: KMail/1.9.6 Cc: linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200704202219.30464.bzolnier@gmail.com> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org 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 diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index ca2e4f8..5bdf64b 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig @@ -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 diff --git a/drivers/ide/pci/delkin_cb.c b/drivers/ide/pci/delkin_cb.c index d4b753e..dd7ec37 100644 --- a/drivers/ide/pci/delkin_cb.c +++ b/drivers/ide/pci/delkin_cb.c @@ -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); diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c index 60ecdc2..ab6fa27 100644 --- a/drivers/ide/pci/hpt366.c +++ b/drivers/ide/pci/hpt366.c @@ -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 * 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 = {