Merge branch 'master' of git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / drivers / net / sk98lin / ski2c.c

diff --git a/drivers/net/sk98lin/ski2c.c b/drivers/net/sk98lin/ski2c.c
index 2ab635a229d34672c23df866cd35af0c1ed5d4c8..894cc67cbdbf38c46bef3c1e090b0c80be583b50 100644 (file)
--- a/drivers/net/sk98lin/ski2c.c
+++ b/drivers/net/sk98lin/ski2c.c
@@ -230,8 +230,6 @@
 
 #include <config.h>
 
-#ifdef CONFIG_SK98
-
 /*
  *     I2C Protocol
  */
@@ -281,7 +279,7 @@ static const char SysKonnectFileId[] =
 .                      +-----------------+
 .                      | Temperature and |
 .                      | Voltage Sensor  |
-.                      |       LM80      |
+.                      |       LM80      |
 .                      +-----------------+
 .                              |
 .                              |
@@ -323,7 +321,7 @@ intro()
  */
 #ifndef I2C_SLOW_TIMING
 #define        T_CLK_LOW                       1300L   /* clock low time in ns */
-#define        T_CLK_HIGH                       600L   /* clock high time in ns */
+#define        T_CLK_HIGH                       600L   /* clock high time in ns */
 #define T_DATA_IN_SETUP                 100L   /* data in Set-up Time */
 #define T_START_HOLD            600L   /* start condition hold time */
 #define T_START_SETUP           600L   /* start condition Set-up time */
@@ -1501,5 +1499,3 @@ SK_EVPARA Para)   /* Event specific Parameter */
 }      /* SkI2cEvent*/
 
 #endif /* !SK_DIAG */
-
-#endif /* CONFIG_SK98 */