summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLarry Johnson <lrj@acm.org>2008-01-09 12:42:35 -0500
committerWolfgang Denk <wd@denx.de>2008-01-12 00:26:47 +0100
commit92fa37eac530860643afa26ae347af3d23d67309 (patch)
treede5a83022e92e374908ba4c8ef49ffccb6f37ac1
parentefc6f447c1b940d1650c4b854c5598a595ddc3da (diff)
Remove superfluous preprocessor conditionals from LM73 driver
(1) Remove unused symbol "CFG_EEPROM_PAGE_WRITE_ENABLE". (2) Use conditional Makefile.o. Signed-off-by: Larry Johnson <lrj@acm.org>
-rw-r--r--drivers/hwmon/Makefile2
-rw-r--r--drivers/hwmon/lm73.c9
-rw-r--r--include/configs/korat.h1
3 files changed, 1 insertions, 11 deletions
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index 32e3f44a9..065433a60 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -34,7 +34,7 @@ COBJS-y += adm1021.o
COBJS-y += ds1621.o
COBJS-y += ds1722.o
COBJS-y += ds1775.o
-COBJS-y += lm73.o
+COBJS-$(CONFIG_DTT_LM73) += lm73.o
COBJS-y += lm75.o
COBJS-y += lm81.o
diff --git a/drivers/hwmon/lm73.c b/drivers/hwmon/lm73.c
index f9ae01297..db8ef662a 100644
--- a/drivers/hwmon/lm73.c
+++ b/drivers/hwmon/lm73.c
@@ -31,13 +31,6 @@
*/
#include <common.h>
-
-#ifdef CONFIG_DTT_LM73
-#if !defined(CFG_EEPROM_PAGE_WRITE_ENABLE) || \
- (CFG_EEPROM_PAGE_WRITE_BITS < 1)
-# error "CFG_EEPROM_PAGE_WRITE_ENABLE must be defined and CFG_EEPROM_PAGE_WRITE_BITS must be greater than 1 to use CONFIG_DTT_LM73"
-#endif
-
#include <i2c.h>
#include <dtt.h>
@@ -177,5 +170,3 @@ int dtt_get_temp(int sensor)
{
return (dtt_read(sensor, DTT_READ_TEMP) + 0x0040) >> 7;
} /* dtt_get_temp() */
-
-#endif /* CONFIG_DTT_LM73 */
diff --git a/include/configs/korat.h b/include/configs/korat.h
index 7d0640bbc..518297282 100644
--- a/include/configs/korat.h
+++ b/include/configs/korat.h
@@ -156,7 +156,6 @@
#define CFG_I2C_MULTI_EEPROMS
#define CFG_I2C_EEPROM_ADDR (0xa8>>1)
#define CFG_I2C_EEPROM_ADDR_LEN 1
-#define CFG_EEPROM_PAGE_WRITE_ENABLE
#define CFG_EEPROM_PAGE_WRITE_BITS 3
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10