diff --git a/CHANGELOG b/CHANGELOG
index 7e38f4de89a41ec0f59407edeab572a5c6fbf62a..8999b153bc468f19261e6c74baaa7088fde394de 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 a1bec1cc29da2f42d05d964803cc4807184fa450..a0f5be81dd551e6756d580b59ee79b9fb5b76819 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
 /****************************************************************************/
 
 /*