sensors/lm_sensors-drop-i2c-tools.dif

Index: Makefile
===================================================================
--- Makefile.orig
+++ Makefile
@@ -187,8 +187,11 @@ endif
 endif
 endif
 SRCDIRS += kernel/include
-SRCDIRS += lib prog/detect prog/dump prog/eeprom prog/pwm \
-           prog/sensors prog/xeon ${PROG_EXTRA:%=prog/%} etc
+SRCDIRS += lib prog/detect prog/pwm \
+           prog/sensors ${PROG_EXTRA:%=prog/%} etc
+ifneq (,$(findstring $(MACHINE), i386 i486 i586 i686 x86_64))
+SRCDIRS += prog/dump
+endif
 SRCDIRS += lib/test
 
 # Some often-used commands with default options
Index: prog/detect/Module.mk
===================================================================
--- prog/detect/Module.mk.orig
+++ prog/detect/Module.mk
@@ -22,14 +22,13 @@ MODULE_DIR := prog/detect
 PROGDETECTDIR := $(MODULE_DIR)
 
 PROGDETECTMAN8DIR := $(MANDIR)/man8
-PROGDETECTMAN8FILES := $(MODULE_DIR)/i2cdetect.8 $(MODULE_DIR)/sensors-detect.8
+PROGDETECTMAN8FILES := $(MODULE_DIR)/sensors-detect.8
 
 # Regrettably, even 'simply expanded variables' will not put their currently
 # defined value verbatim into the command-list of rules...
-PROGDETECTTARGETS := $(MODULE_DIR)/i2cdetect
-PROGDETECTSOURCES := $(MODULE_DIR)/i2cdetect.c
-PROGDETECTSBININSTALL := $(MODULE_DIR)/sensors-detect \
-                         $(MODULE_DIR)/i2cdetect
+PROGDETECTTARGETS := 
+PROGDETECTSOURCES := 
+PROGDETECTSBININSTALL := $(MODULE_DIR)/sensors-detect
 
 # Include all dependency files. We use '.rd' to indicate this will create
 # executables.
Index: prog/dump/Module.mk
===================================================================
--- prog/dump/Module.mk.orig
+++ prog/dump/Module.mk
@@ -22,18 +22,13 @@ MODULE_DIR := prog/dump
 PROGDUMPDIR := $(MODULE_DIR)
 
 PROGDUMPMAN8DIR := $(MANDIR)/man8
-PROGDUMPMAN8FILES := $(MODULE_DIR)/i2cdump.8 $(MODULE_DIR)/i2cset.8 \
-		     $(MODULE_DIR)/i2cget.8
+PROGDUMPMAN8FILES := 
 
 # Regrettably, even 'simply expanded variables' will not put their currently
 # defined value verbatim into the command-list of rules...
-PROGDUMPTARGETS := $(MODULE_DIR)/i2cdump $(MODULE_DIR)/i2cset \
-		   $(MODULE_DIR)/i2cget
-PROGDUMPSOURCES := $(MODULE_DIR)/i2cdump.c $(MODULE_DIR)/i2cset.c \
-		   $(MODULE_DIR)/i2cget.c $(MODULE_DIR)/i2cbusses.c \
-		   $(MODULE_DIR)/util.c
-PROGDUMPBININSTALL := $(MODULE_DIR)/i2cdump $(MODULE_DIR)/i2cset \
-		      $(MODULE_DIR)/i2cget
+PROGDUMPTARGETS := 
+PROGDUMPSOURCES := 
+PROGDUMPBININSTALL :=
 
 # Only build isadump and isaset on x86 machines.
 ifneq (,$(findstring $(MACHINE), i386 i486 i586 i686 x86_64))
Index: doc/progs
===================================================================
--- doc/progs.orig
+++ doc/progs
@@ -18,13 +18,6 @@ see http://www.lm-sensors.org/wiki/Usefu
 * prog/daemon/healthd.sh (written in bash, not installed)
   An example of a very simple hardware health monitoring daemon.
 
-* prog/detect/i2cdetect (written in C, installed by 'make install')
-  This program scans your complete I2C or SMBus adapter for connected devices.
-  Syntax:
-    i2cdetect 0
-  Here the '0' stands for the bus number (run "i2cdetect -l"
-  to list all installed busses).
-
 * prog/detect/sensors-detect (written in Perl, installed by 'make install')
   This program tries to detect the available SMBus adapters and the chips
   connected to them, as well as Super-I/O and misc chips. It also generates
@@ -43,40 +36,12 @@ see http://www.lm-sensors.org/wiki/Usefu
   all module information and outputs insmod parameter information. Syntax:
     ./doc-insmod.pl DRIVER
 
-* prog/dump/i2cdump (written in C, installed by 'make install')
-  This program dumps the registers of an I2C device.
-  Usual syntax:
-    i2cdump 0 0x4c b
-  Here the '0' stands for the bus number (run i2cdump with no arguments 
-  to list all installed busses).
-  '0x49' is the device address, and 'b' or 'w' stands for byte
-  or word data.
-
-* prog/dump/i2cset (written in C, installed by 'make install')
-  prog/dump/i2cget (written in C, installed by 'make install')
-  These programs are used to write to or read from a register of an
-  I2C device. Usual syntax:
-    i2cset bus device address data
-    i2cget bus device address
-
 * prog/dump/isadump (written in C, installed by 'make install')
   This program dumps the registers of ISA or Super-I/O chips.
   Usual syntax:
      isadump 0x295 0x296
      isadump -k 0x55 0x2e 0x2f
 
-* prog/eeprom/decode-dimms.pl (perl script, installed by 'make install')
-  This program decodes the information found in a memory module SPD EEPROM.
-
-* prog/eeprom/decode-vaio.pl (perl script, installed by 'make install')
-  This program decodes the information in a Sony Vaio laptop
-  identification eeprom at 0x57.
-
-* prog/eeprom/ddcmon (perl script, installed by 'make install')
-  prog/eeprom/decode-edid.pl (perl script, installed by 'make install')
-  These programs decode the information found in a display EEPROM. They
-  require a bus driver for your video adapter, for DDC access to the display.
-
 * prog/eepromer/eepromer (written in C, not installed)
   This program reads and writes eeproms.
   Danger: Do not use this to write your DRAM DIMM eeproms.
@@ -145,6 +110,3 @@ see http://www.lm-sensors.org/wiki/Usefu
 * prog/tellerstats/gather.sh, tellerstats.sh (written in bash, not installed)
   These scripts gather sensors data and graph the data for web pages.
   See prog/tellerstats/README for more information.
-
-* prog/xeon/decode-xeon.pl (written in Perl, installed by 'make install')
-  ID ROM data decoding for Xeon processors.
Index: kernel/include/Module.mk
===================================================================
--- kernel/include/Module.mk.orig
+++ kernel/include/Module.mk
@@ -22,7 +22,7 @@ MODULE_DIR := kernel/include
 KERNELINCLUDEDIR := $(MODULE_DIR)
 KERNELCHIPSDIR := kernel/chips
 
-KERNELINCLUDEFILES := $(MODULE_DIR)/i2c-dev.h $(MODULE_DIR)/sensors.h
+KERNELINCLUDEFILES := $(MODULE_DIR)/sensors.h
 
 $(KERNELINCLUDEDIR)/sensors.h: $(KERNELINCLUDEDIR)/sensors.h.template
 	cat $@.template > $@