From 5d5e6410e08988671ea85d80365a6cc4f4d643d3 Mon Sep 17 00:00:00 2001
From: "Mark D. Studebaker" <mdsxyz123@yahoo.com>
Date: Sat, 16 Sep 2000 02:21:55 +0000
Subject: [PATCH] (mds) removed FORCE #ifdef which never worked anyway.

git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@874 7894878c-1315-0410-8ee3-d5d059ff63e0
---
 CHANGES                     |  7 +++++++
 kernel/busses/i2c-ali15x3.c | 16 ----------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/CHANGES b/CHANGES
index 777a8e22..e49fb325 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+lm_sensors CHANGES file
+-----------------------
 This is a list of the most important changes between 2.x versions. It is by
 no means complete, listing only user-visible changes which are interesting.
 The ultimate way to know what has changed is to run diff, or even neater,
@@ -13,9 +15,14 @@ ask CVS about it:
     for example:
       cvs diff -r V2-0-0 -r V2-0-1 -u
 
+-----------------------
+
 2.5.3 (2000????)
+  NOTE: i2c 2.5.3 MUST BE be compiled and installed first.
   File useful_addresses.html: update
   Library: Add lm87 support
+  Module ali-1535: new
+  Module ali-15x3: removed force #ifdef.
   Module i2c-i801: support Intel 82801BA (815E chipset)
   Module i2c-i801: add i2c block write support, fix smbus block bugs
                    (requires i2c 2.5.3 package)
diff --git a/kernel/busses/i2c-ali15x3.c b/kernel/busses/i2c-ali15x3.c
index de351a29..44da2cfb 100644
--- a/kernel/busses/i2c-ali15x3.c
+++ b/kernel/busses/i2c-ali15x3.c
@@ -73,8 +73,6 @@
 
 #include <linux/init.h>
 
-#undef FORCE_ALI15X3_ENABLE
-
 /* ALI15X3 SMBus address offsets */
 #define SMBHSTSTS (0 + ali15x3_smba)
 #define SMBHSTCNT (1 + ali15x3_smba)
@@ -254,26 +252,12 @@ int ali15x3_setup(void)
 
 /* Is SMB Host controller enabled? */
 	pci_read_config_byte(ALI15X3_dev, SMBHSTCFG, &temp);
-#ifdef FORCE_ALI15X3_ENABLE
-/* This should never need to be done.
-   NOTE: This assumes I/O space and other allocations WERE
-   done by the Bios!  Don't complain if your hardware does weird 
-   things after enabling this. :') Check for Bios updates before
-   resorting to this.  */
-	if ((temp & 1) == 0) {
-		pci_write_config_byte(ALI15X3_dev, SMBHSTCFG, temp | 1);
-		printk
-		    ("i2c-ali15x3.o: WARNING: ALI15X3 SMBus interface has been FORCEFULLY "
-		     "ENABLED!!\n");
-	}
-#else				/* FORCE_ALI15X3_ENABLE */
 	if ((temp & 1) == 0) {
 		printk
 		    ("SMBUS: Error: Host SMBus controller not enabled - upgrade BIOS?\n");
 		error_return = -ENODEV;
 		goto END;
 	}
-#endif				/* FORCE_ALI15X3_ENABLE */
 
 /* set SMB clock to 74KHz as recommended in data sheet */
 	pci_write_config_byte(ALI15X3_dev, SMBCLK, 0x20);