From df3d00c2682c68d5bb555499ec1a6ff25f302430 Mon Sep 17 00:00:00 2001
From: "Mark D. Studebaker" <mdsxyz123@yahoo.com>
Date: Mon, 18 Nov 2002 21:02:15 +0000
Subject: [PATCH] remove #ifndef for DRIVERID, 2.7.0 release will require
 i2c-2.7.0

git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1622 7894878c-1315-0410-8ee3-d5d059ff63e0
---
 kernel/chips/fscpos.c   | 5 -----
 kernel/chips/fscscy.c   | 5 -----
 kernel/chips/lm92.c     | 4 ----
 kernel/chips/pcf8591.c  | 4 ----
 kernel/chips/smsc47m1.c | 4 ----
 kernel/chips/vt1211.c   | 4 ----
 kernel/chips/vt8231.c   | 4 ----
 7 files changed, 30 deletions(-)

diff --git a/kernel/chips/fscpos.c b/kernel/chips/fscpos.c
index 1c44f544..6c5d45f9 100644
--- a/kernel/chips/fscpos.c
+++ b/kernel/chips/fscpos.c
@@ -39,11 +39,6 @@
 #include "sensors.h"
 #include <linux/init.h>
 
-/* temp. because wasn't in kernel 2.4.13 patch */
-#ifndef I2C_DRIVERID_FSCPOS
-#define I2C_DRIVERID_FSCPOS 1028
-#endif
-
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18)) || \
     (LINUX_VERSION_CODE == KERNEL_VERSION(2,3,0))
 #define init_MUTEX(s) do { *(s) = MUTEX; } while(0)
diff --git a/kernel/chips/fscscy.c b/kernel/chips/fscscy.c
index 701822fd..77557198 100644
--- a/kernel/chips/fscscy.c
+++ b/kernel/chips/fscscy.c
@@ -39,11 +39,6 @@
 #include "sensors.h"
 #include <linux/init.h>
 
-/* temp. because wasn't in kernel 2.4.13 patch */
-#ifndef I2C_DRIVERID_FSCSCY
-#define I2C_DRIVERID_FSCSCY 1029
-#endif
-
 #ifdef MODULE_LICENSE
 MODULE_LICENSE("GPL");
 #endif
diff --git a/kernel/chips/lm92.c b/kernel/chips/lm92.c
index 4b94f427..934dd7d0 100644
--- a/kernel/chips/lm92.c
+++ b/kernel/chips/lm92.c
@@ -370,10 +370,6 @@ static void lm92_dec_use (struct i2c_client *client)
 #endif	/* #ifdef MODULE */
 }
 
-#ifndef I2C_DRIVERID_LM92
-#define I2C_DRIVERID_LM92 1033
-#endif	/* #ifndef I2C_DRIVERID_LM92 */
-
 static struct i2c_driver lm92_driver = {
 	name:			"lm92",
 	id:				I2C_DRIVERID_LM92,
diff --git a/kernel/chips/pcf8591.c b/kernel/chips/pcf8591.c
index be9d067f..85cfb2ac 100644
--- a/kernel/chips/pcf8591.c
+++ b/kernel/chips/pcf8591.c
@@ -26,10 +26,6 @@
 #include "version.h"
 #include <linux/init.h>
 
-#ifndef I2C_DRIVERID_PCF8591
-#define I2C_DRIVERID_PCF8591 1030
-#endif
-
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18)) || \
     (LINUX_VERSION_CODE == KERNEL_VERSION(2,3,0))
 #define init_MUTEX(s) do { *(s) = MUTEX; } while(0)
diff --git a/kernel/chips/smsc47m1.c b/kernel/chips/smsc47m1.c
index 91eeef0f..f95bff1b 100644
--- a/kernel/chips/smsc47m1.c
+++ b/kernel/chips/smsc47m1.c
@@ -38,10 +38,6 @@
 #define init_MUTEX(s) do { *(s) = MUTEX; } while(0)
 #endif
 
-#ifndef I2C_DRIVERID_SMSC47M1
-#define I2C_DRIVERID_SMSC47M1 1031
-#endif
-
 #ifndef THIS_MODULE
 #define THIS_MODULE NULL
 #endif
diff --git a/kernel/chips/vt1211.c b/kernel/chips/vt1211.c
index 13481e59..ca704f3f 100644
--- a/kernel/chips/vt1211.c
+++ b/kernel/chips/vt1211.c
@@ -41,10 +41,6 @@
 #define init_MUTEX(s) do { *(s) = MUTEX; } while(0)
 #endif
 
-#ifndef I2C_DRIVERID_VT1211
-#define I2C_DRIVERID_VT1211 1032
-#endif
-
 #ifndef THIS_MODULE
 #define THIS_MODULE NULL
 #endif
diff --git a/kernel/chips/vt8231.c b/kernel/chips/vt8231.c
index b8cff980..cc7b394c 100644
--- a/kernel/chips/vt8231.c
+++ b/kernel/chips/vt8231.c
@@ -42,10 +42,6 @@
 #define init_MUTEX(s) do { *(s) = MUTEX; } while(0)
 #endif
 
-#ifndef I2C_DRIVERID_VT8231
-#define I2C_DRIVERID_VT8231 1034
-#endif
-
 #ifndef THIS_MODULE
 #define THIS_MODULE NULL
 #endif