[PATCH] remove obsolete i2c headers

* i2c-elektor.h is empty except for comments
* sensors.h contains register offsets for tons of hw monitoring chips,
  move the few we actually need into the two drivers that use it
  (there is _no_ overlap)

drivers/i2c/chips/adm1021.c

@@ -23,9 +23,20 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/sensors.h>
+#include <linux/i2c-proc.h>
 #include <linux/init.h>
 
+/* Registers */
+#define ADM1021_SYSCTL_TEMP		1200
+#define ADM1021_SYSCTL_REMOTE_TEMP	1201
+#define ADM1021_SYSCTL_DIE_CODE		1202
+#define ADM1021_SYSCTL_ALARMS		1203
+
+#define ADM1021_ALARM_TEMP_HIGH		0x40
+#define ADM1021_ALARM_TEMP_LOW		0x20
+#define ADM1021_ALARM_RTEMP_HIGH	0x10
+#define ADM1021_ALARM_RTEMP_LOW		0x08
+#define ADM1021_ALARM_RTEMP_NA		0x04
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { SENSORS_I2C_END };

drivers/i2c/chips/lm75.c

@@ -22,10 +22,12 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/sensors.h>
+#include <linux/i2c-proc.h>
 #include <linux/init.h>
 
 
+#define LM75_SYSCTL_TEMP 1200	/* Degrees Celcius * 10 */
+
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { SENSORS_I2C_END };
 static unsigned short normal_i2c_range[] = { 0x48, 0x4f, SENSORS_I2C_END };

drivers/i2c/i2c-elektor.c

@@ -38,7 +38,6 @@
 
 #include <linux/i2c.h>
 #include <linux/i2c-algo-pcf.h>
-#include <linux/i2c-elektor.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>

include/linux/i2c-elektor.h

-/* ------------------------------------------------------------------------- */
-/* i2c-elektor.c i2c-hw access for PCF8584 style isa bus adaptes             */
-/* ------------------------------------------------------------------------- */
-/*   Copyright (C) 1995-97 Simon G. Vogl
-                   1998-99 Hans Berglund
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.                */
-/* ------------------------------------------------------------------------- */
-
-/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and even
-   Frodo Looijaard <frodol@dds.nl> */
-
-/* $Id: i2c-elektor.h,v 1.5 2001/06/05 01:46:33 mds Exp $ */
-
-#ifndef I2C_PCF_ELEKTOR_H
-#define I2C_PCF_ELEKTOR_H 1
-
-/*
- * This struct contains the hw-dependent functions of PCF8584 adapters to
- * manipulate the registers, and to init any hw-specific features.
- * vdovikin: removed: this module in real supports only one device,
- * due to missing arguments in some functions, called from the algo-pcf module.
- * Sometimes it's need to be rewriten -
- * but for now just remove this for simpler reading */
-
-/*
-struct i2c_pcf_isa {
-	int pi_base;
-	int pi_irq;
-	int pi_clock;
-	int pi_own;
-};
-*/
-
-#endif /* PCF_ELEKTOR_H */