summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2006-03-12 01:40:01 +0100
committerWolfgang Denk <wd@pollux.denx.de>2006-03-12 01:40:01 +0100
commit7c54c7018e9c6f50931c07afe1805bef1be0def9 (patch)
tree38d564b797509826f5090486586b6ec9136bd340
parent92b197f0da45ae086b7c457184ae67a432ef1c5e (diff)
downloadu-boot-imx-7c54c7018e9c6f50931c07afe1805bef1be0def9.zip
u-boot-imx-7c54c7018e9c6f50931c07afe1805bef1be0def9.tar.gz
u-boot-imx-7c54c7018e9c6f50931c07afe1805bef1be0def9.tar.bz2
Fix conditional for including ks8695eth driver
Patch by Greg Ungerer, 04 Jun 2005
-rw-r--r--CHANGELOG3
-rw-r--r--drivers/ks8695eth.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 7e38f4d..8999b15 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
Changes since U-Boot 1.1.4:
======================================================================
+* Fix conditional for including ks8695eth driver
+ Patch by Greg Ungerer, 04 Jun 2005
+
* Fix Makefile: include config.mk only after CROSS_COMPILE is defined
Patch by Friedrich Lobenstock, 02 Jun 2005
diff --git a/drivers/ks8695eth.c b/drivers/ks8695eth.c
index a1bec1c..a0f5be8 100644
--- a/drivers/ks8695eth.c
+++ b/drivers/ks8695eth.c
@@ -18,8 +18,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifdef CONFIG_DRIVER_KS8695ETH
-
/****************************************************************************/
#include <common.h>
@@ -28,6 +26,7 @@
#include <asm/io.h>
#include <asm/arch/platform.h>
+#ifdef CONFIG_DRIVER_KS8695ETH
/****************************************************************************/
/*