public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: linux-kernel@vger.kernel.org, sensors@stimpy.netroedge.com
Subject: Re: [PATCH] I2C fixes for 2.6.10-rc2
Date: Tue, 30 Nov 2004 16:13:39 -0800	[thread overview]
Message-ID: <11018600193669@kroah.com> (raw)
In-Reply-To: <11018600193653@kroah.com>

ChangeSet 1.2223.2.10, 2004/11/29 15:41:38-08:00, khali@linux-fr.org

[PATCH] I2C: Add support for the nForce2 Ultra 400 to i2c-nforce2

This simple patch adds support for the nForce2 Ultra 400 to i2c-nforce2.
I just made a similar update on the 2.4/CVS version of the driver.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>


 drivers/i2c/busses/i2c-nforce2.c |    9 ++++++---
 include/linux/pci_ids.h          |    1 +
 2 files changed, 7 insertions(+), 3 deletions(-)


diff -Nru a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c
--- a/drivers/i2c/busses/i2c-nforce2.c	2004-11-30 16:00:37 -08:00
+++ b/drivers/i2c/busses/i2c-nforce2.c	2004-11-30 16:00:37 -08:00
@@ -24,9 +24,10 @@
 */
 
 /*
-    SUPPORTED DEVICES	PCI ID
-    nForce2 MCP		0064
-    nForce3 Pro150 MCP	00D4
+    SUPPORTED DEVICES		PCI ID
+    nForce2 MCP			0064
+    nForce2 Ultra 400 MCP	0084
+    nForce3 Pro150 MCP		00D4
 
     This driver supports the 2 SMBuses that are included in the MCP2 of the
     nForce2 chipset.
@@ -290,6 +291,8 @@
 
 static struct pci_device_id nforce2_ids[] = {
 	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2_SMBUS,
+	       	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2S_SMBUS,
 	       	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
 	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3_SMBUS,
 	       	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
diff -Nru a/include/linux/pci_ids.h b/include/linux/pci_ids.h
--- a/include/linux/pci_ids.h	2004-11-30 16:00:37 -08:00
+++ b/include/linux/pci_ids.h	2004-11-30 16:00:37 -08:00
@@ -1087,6 +1087,7 @@
 #define PCI_DEVICE_ID_NVIDIA_NFORCE2_IDE	0x0065
 #define PCI_DEVICE_ID_NVIDIA_NVENET_2		0x0066
 #define PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO		0x006a
+#define PCI_DEVICE_ID_NVIDIA_NFORCE2S_SMBUS	0x0084
 #define PCI_DEVICE_ID_NVIDIA_NFORCE2S_IDE	0x0085
 #define PCI_DEVICE_ID_NVIDIA_NVENET_4		0x0086
 #define PCI_DEVICE_ID_NVIDIA_NVENET_5		0x008c


  reply	other threads:[~2004-12-01  0:15 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-12-01  0:12 [BK PATCH] I2C fixes for 2.6.10-rc2 Greg KH
2004-12-01  0:13 ` [PATCH] " Greg KH
2004-12-01  0:13   ` Greg KH
2004-12-01  0:13     ` Greg KH
2004-12-01  0:13       ` Greg KH
2004-12-01  0:13         ` Greg KH
2004-12-01  0:13           ` Greg KH
2004-12-01  0:13             ` Greg KH
2004-12-01  0:13               ` Greg KH
2004-12-01  0:13                 ` Greg KH
2004-12-01  0:13                   ` Greg KH [this message]
2004-12-01  0:13                     ` Greg KH
2004-12-01  0:13                       ` Greg KH
  -- strict thread matches above, loose matches on Subject: below --
2004-11-19 21:59 [BK PATCH] " Greg KH
2004-11-19 22:00 ` [PATCH] " Greg KH
2004-11-19 22:00   ` Greg KH
2004-11-19 22:00     ` Greg KH
2004-11-19 22:00       ` Greg KH
2004-11-19 22:01         ` Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=11018600193669@kroah.com \
    --to=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sensors@stimpy.netroedge.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox