From 9334e32e6ce0a795d490fea78b651d45093e44c6 Mon Sep 17 00:00:00 2001
From: "Mark D. Studebaker" <mdsxyz123@yahoo.com>
Date: Wed, 1 May 2002 23:33:53 +0000
Subject: [PATCH] nForce cleanup and docs

git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1366 7894878c-1315-0410-8ee3-d5d059ff63e0
---
 CHANGES                    |  2 ++
 README                     |  1 +
 doc/busses/i2c-amd756      |  3 +++
 kernel/busses/i2c-amd756.c | 18 ++++++------------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/CHANGES b/CHANGES
index 648def3e..dddd72e1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -26,6 +26,8 @@ ask CVS about it:
              kernel/drivers/[i2c,sensors] , not misc/ , and
              removes old versions in misc/ .
              Use $CFLAGS and $CPPFLAGS if defined.
+  Module i2c-amd756: Add nVidia nForce support; fix block read length;
+                     reliability improvements
   Module i2c-savage4: new
   Module i2c-viapro: Add support for VT8233A (0x3147)
   Module w83781d: Add multiple VRM version support
diff --git a/README b/README
index d045c4c5..1eda2970 100644
--- a/README
+++ b/README
@@ -44,6 +44,7 @@ At least the following I2C/SMBus adapters are supported:
   Intel PIIX4 (used in many Intel chipsets)
   Intel I810/I815 GMCH
   Intel 82443MX (440MX)
+  NVidia nForce
   ServerWorks OSB4, CSB5
   SiS 5595
   SMSC Victory66
diff --git a/doc/busses/i2c-amd756 b/doc/busses/i2c-amd756
index 68b41e62..1c9a1656 100644
--- a/doc/busses/i2c-amd756
+++ b/doc/busses/i2c-amd756
@@ -8,6 +8,9 @@ Supported adapters:
   * AMD 768
     Datasheets: Publicly available on AMD website
 
+  * nVidia nForce
+    Datasheet: Unavailable
+
 
 Module Parameters
 -----------------
diff --git a/kernel/busses/i2c-amd756.c b/kernel/busses/i2c-amd756.c
index cb520b84..ae50969d 100644
--- a/kernel/busses/i2c-amd756.c
+++ b/kernel/busses/i2c-amd756.c
@@ -45,22 +45,12 @@
 #include "version.h"
 #include <linux/init.h>
 
-#ifdef MODULE_LICENSE
-MODULE_LICENSE("GPL");
-#endif
-
 #ifndef PCI_DEVICE_ID_AMD_756
 #define PCI_DEVICE_ID_AMD_756 0x740B
 #endif
 #ifndef PCI_DEVICE_ID_AMD_766
 #define PCI_DEVICE_ID_AMD_766 0x7413
 #endif
-#ifndef PCI_DEVICE_ID_AMD_768
-#define PCI_DEVICE_ID_AMD_768 0x7443
-#endif
-#ifndef PCI_VENDOR_ID_NVIDIA
-#define PCI_VENDOR_ID_NVIDIA 0x10DE
-#endif
 #ifndef PCI_DEVICE_ID_NVIDIA_NFORCE_SMBUS
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_SMBUS 0x01B4
 #endif
@@ -76,8 +66,8 @@ struct sd {
 static struct sd supported[] = {
     {PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_756, 3, "AMD756", 1},
     {PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_766, 3, "AMD766", 1},
-    {PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_768, 3, "AMD768", 1},
-    {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_SMBUS, 1, "nVidia nForce", 0},
+    {PCI_VENDOR_ID_AMD, 0x7443, 3, "AMD768", 1},
+    {PCI_VENDOR_ID_NVIDIA, 0x01B4, 1, "nVidia nForce", 0},
     {0, 0, 0}
 };
 
@@ -534,6 +524,10 @@ EXPORT_NO_SYMBOLS;
 MODULE_AUTHOR("Merlin Hughes <merlin@merlin.org>");
 MODULE_DESCRIPTION("AMD756/766 SMBus driver");
 
+#ifdef MODULE_LICENSE
+MODULE_LICENSE("GPL");
+#endif
+
 int init_module(void)
 {
 	return i2c_amd756_init();