From 9483df6408c25f16060432de3868901e352e23bc Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Date: Wed, 13 Aug 2008 01:40:43 +0200 Subject: [PATCH] drivers/mtd/nand_legacy: Move conditional compilation to Makefile Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> --- drivers/mtd/nand_legacy/Makefile | 5 ++++- drivers/mtd/nand_legacy/nand_legacy.c | 5 ----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/mtd/nand_legacy/Makefile b/drivers/mtd/nand_legacy/Makefile index 4e29c36e70..a1a9cc92b5 100644 --- a/drivers/mtd/nand_legacy/Makefile +++ b/drivers/mtd/nand_legacy/Makefile @@ -25,8 +25,11 @@ include $(TOPDIR)/config.mk LIB := $(obj)libnand_legacy.a -COBJS := nand_legacy.o +ifdef CONFIG_CMD_NAND +COBJS-$(CONFIG_NAND_LEGACY) := nand_legacy.o +endif +COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) diff --git a/drivers/mtd/nand_legacy/nand_legacy.c b/drivers/mtd/nand_legacy/nand_legacy.c index 8f7dc3901a..bf5565a8fb 100644 --- a/drivers/mtd/nand_legacy/nand_legacy.c +++ b/drivers/mtd/nand_legacy/nand_legacy.c @@ -14,9 +14,6 @@ #include <malloc.h> #include <asm/io.h> #include <watchdog.h> - -#if defined(CONFIG_CMD_NAND) && defined(CONFIG_NAND_LEGACY) - #include <linux/mtd/nand_legacy.h> #include <linux/mtd/nand_ids.h> #include <jffs2/jffs2.h> @@ -1608,5 +1605,3 @@ int read_jffs2_nand(size_t start, size_t len, start, len, retlen, buf); } #endif /* CONFIG_JFFS2_NAND */ - -#endif -- 2.39.5