commit 5e24b9eb5885645ff26b35ba2e07f0e344bac18f
author Heinrich Schuchardt <xypron.glpk@gmx.de> Sun Jan 03 16:10:45 2021 +0100
committer Tom Rini <trini@konsulko.com> Sat Jan 16 19:17:11 2021 -0500
tree 796a4431985cfd6d062cd0c51276de014cb9bb37
parent 8239a7f21ee97a1ff0521b6fc37e771c18a7b29c

mtd: misplaced log.h and dm/devres.h

log.h and dm/devres.h are U-Boot includes. So placing them
behind #ifndef __UBOOT__ does not make any sense.

Fixes: f7ae49fc4f36 ("common: Drop log.h from common header")
Fixes: 61b29b826838 ("dm: core: Require users of devres to include the header")
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>

drivers/mtd/mtdcore.c

diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 1a4dec3..0d1f94c 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -9,8 +9,6 @@
  */
 
 #ifndef __UBOOT__
-#include <log.h>
-#include <dm/devres.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/ptrace.h>