miiphyutil: Move conditional compilation to Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --git a/common/Makefile b/common/Makefile
index 918b90856b1d755bb6bf0addf45426ab147ddd50..6ba20c0254b120344dcf1404d70eb26d78811ce0 100644 (file)
--- a/common/Makefile
+++ b/common/Makefile
@@ -84,6 +84,7 @@ COBJS-$(CONFIG_CMD_LICENSE) += cmd_license.o
 COBJS-y += cmd_load.o
 COBJS-$(CONFIG_LOGBUFFER) += cmd_log.o
 COBJS-y += cmd_mem.o
+COBJS-$(CONFIG_MII)$(CONFIG_CMD_MII) += miiphyutil.o
 COBJS-$(CONFIG_CMD_MII) += cmd_mii.o
 COBJS-$(CONFIG_CMD_MISC) += cmd_misc.o
 COBJS-$(CONFIG_CMD_MMC) += cmd_mmc.o
@@ -133,7 +134,6 @@ COBJS-$(CONFIG_LCD) += lcd.o
 COBJS-y += lists.o
 COBJS-$(CONFIG_LYNXKDI) += lynxkdi.o
 COBJS-y += memsize.o
-COBJS-y += miiphyutil.o
 COBJS-y += s_record.o
 COBJS-y += serial.o
 ifdef CONFIG_CMD_USB

diff --git a/common/miiphyutil.c b/common/miiphyutil.c
index eac8275a40562d2b8aea688ddfabf781e591a26e..5ef4a33ce774a8a3dd73db6e0f842fe4c304317a 100644 (file)
--- a/common/miiphyutil.c
+++ b/common/miiphyutil.c
@@ -29,7 +29,6 @@
 #include <common.h>
 #include <miiphy.h>
 
-#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
 #include <asm/types.h>
 #include <linux/list.h>
 #include <malloc.h>
@@ -487,4 +486,3 @@ int miiphy_link (char *devname, unsigned char addr)
        }
 }
 #endif
-#endif /* CONFIG_MII */

diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
index 10dc082069277a31fc31763198c79c0a82cd22d8..4fe3b052121126e0aaff41843f9fef180099669a 100644 (file)
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -1,5 +1,5 @@
 #
-# (C) Copyright 2006
+# (C) Copyright 2008
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 #
 # See file CREDITS for list of people who contributed to this