diff --git a/common/Makefile b/common/Makefile
index 27f515b067..2e0fa262dc 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -53,7 +53,7 @@ COBJS-y += env_common.o
 COBJS-$(CONFIG_ENV_IS_IN_DATAFLASH) += env_dataflash.o
 COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o
 COBJS-y += env_flash.o
-COBJS-y += env_nand.o
+COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
 COBJS-y += env_nvram.o
 COBJS-y += env_onenand.o
 COBJS-y += env_sf.o
diff --git a/common/env_nand.c b/common/env_nand.c
index 53e31834c7..9d01d7c726 100644
--- a/common/env_nand.c
+++ b/common/env_nand.c
@@ -33,9 +33,6 @@
 /* #define DEBUG */
 
 #include <common.h>
-
-#if defined(CONFIG_ENV_IS_IN_NAND) /* Environment is in Nand Flash */
-
 #include <command.h>
 #include <environment.h>
 #include <linux/stddef.h>
@@ -366,5 +363,3 @@ static void use_default()
 	set_default_env();
 }
 #endif
-
-#endif /* CONFIG_ENV_IS_IN_NAND */