From 9791b06ae50400267a981ab2d518e33eb8403f26 Mon Sep 17 00:00:00 2001 From: "Mark M. Hoffman" Date: Sun, 3 Aug 2003 05:32:01 +0000 Subject: [PATCH] Fixes backported from 2.6 work by Greg KH: (mmh) o remove devinitdata marking from i2c-nforce2.c as it's wrong (mmh) o minor cleanups to the i2c-nforce2 driver git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1938 7894878c-1315-0410-8ee3-d5d059ff63e0 --- kernel/busses/i2c-nforce2.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/kernel/busses/i2c-nforce2.c b/kernel/busses/i2c-nforce2.c index 4f4e64d2..d2c687b4 100644 --- a/kernel/busses/i2c-nforce2.c +++ b/kernel/busses/i2c-nforce2.c @@ -44,19 +44,13 @@ #include #include "version.h" -#ifdef MODULE_LICENSE MODULE_LICENSE("GPL"); -#endif MODULE_AUTHOR ("Hans-Frieder Vogt "); MODULE_DESCRIPTION("nForce2 SMBus driver"); #ifndef PCI_DEVICE_ID_NVIDIA_NFORCE2_SMBUS #define PCI_DEVICE_ID_NVIDIA_NFORCE2_SMBUS 0x0064 #endif -/* TODO: sync with lm-sensors */ -#ifndef I2C_HW_SMBUS_NFORCE2 -#define I2C_HW_SMBUS_NFORCE2 0x0c -#endif struct nforce2_smbus { @@ -291,7 +285,7 @@ u32 nforce2_func(struct i2c_adapter *adapter) } -static struct pci_device_id nforce2_ids[] __devinitdata = { +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 }, { 0 }