Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f851021 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide/Kconfig: add missing range check for IDE_MAX_HWIFS
  hpt366: fix kernel oops with HPT302N
  ide/pci/delkin_cb.c: add new PCI ID
parents ea8df8c5 8929fea3

drivers/ide/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line 
/*

 * 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 <andre@linux-ide.org>

 * 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 = {