[PATCH] fixup! mtd: nand: move to drivers/mtd/nand/raw/

[PATCH] fixup! mtd: nand: move to drivers/mtd/nand/raw/

[Ahmad Fatoum]

mtd: nand: align IS_ENABLED(symbol) for header stub with Makefile

drivers/mtd/nand/Makefile builds nand-bb.o when CONFIG_MTD_NAND_CORE
is defined. We need to use the same symbol in the header to avoid
breakage when CONFIG_MTD_RAW_NAND is deselected.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 include/nand.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/nand.h b/include/nand.h
index 84f5a9671410..4fb52e9f82d5 100644
--- a/include/nand.h
+++ b/include/nand.h
@@ -4,7 +4,7 @@
 
 struct nand_bb;
 
-#ifdef CONFIG_MTD_RAW_NAND
+#ifdef CONFIG_MTD_NAND_CORE
 int dev_add_bb_dev(const char *filename, const char *name);
 int dev_remove_bb_dev(const char *name);
 struct cdev *mtd_add_bb(struct mtd_info *mtd, const char *name);
-- 
2.39.2

Re: [PATCH] fixup! mtd: nand: move to drivers/mtd/nand/raw/

[Sascha Hauer]

On Wed, Apr 24, 2024 at 08:41:56AM +0200, Ahmad Fatoum wrote:
> mtd: nand: align IS_ENABLED(symbol) for header stub with Makefile
> 
> drivers/mtd/nand/Makefile builds nand-bb.o when CONFIG_MTD_NAND_CORE
> is defined. We need to use the same symbol in the header to avoid
> breakage when CONFIG_MTD_RAW_NAND is deselected.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  include/nand.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks

Sascha

> 
> diff --git a/include/nand.h b/include/nand.h
> index 84f5a9671410..4fb52e9f82d5 100644
> --- a/include/nand.h
> +++ b/include/nand.h
> @@ -4,7 +4,7 @@
>  
>  struct nand_bb;
>  
> -#ifdef CONFIG_MTD_RAW_NAND
> +#ifdef CONFIG_MTD_NAND_CORE
>  int dev_add_bb_dev(const char *filename, const char *name);
>  int dev_remove_bb_dev(const char *name);
>  struct cdev *mtd_add_bb(struct mtd_info *mtd, const char *name);
> -- 
> 2.39.2
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |