summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2020-05-20 12:31:26 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2020-05-22 11:21:06 +0900
commit1e1518866fc8fa28f926440fe6ea3c00b4b18926 (patch)
treed4e73743ec3e9cfbede282f2e66b2a9c35616481
parente9d3b23505d4bdc9cfffcf190a96a4fe9b856d97 (diff)
ARM: uniphier: drop #include <log.h> again
I do not understand the changes made to these files by commit f7ae49fc4f36 ("common: Drop log.h from common header"). git show f7ae49fc4f36 -- arch/arm/mach-uniphier/ None of them uses the log function feature. Simply revert the changes made to these files. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Simon Glass <sjg@chromium.org>
-rw-r--r--arch/arm/mach-uniphier/board_init.c1
-rw-r--r--arch/arm/mach-uniphier/dram/ddrphy-training.c1
-rw-r--r--arch/arm/mach-uniphier/dram/umc-pxs2.c1
-rw-r--r--arch/arm/mach-uniphier/micro-support-card.c1
-rw-r--r--arch/arm/mach-uniphier/nand-reset.c1
5 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-uniphier/board_init.c b/arch/arm/mach-uniphier/board_init.c
index 6bf0811edb..4f9cd6e722 100644
--- a/arch/arm/mach-uniphier/board_init.c
+++ b/arch/arm/mach-uniphier/board_init.c
@@ -5,7 +5,6 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
-#include <log.h>
#include <linux/errno.h>
#include <linux/io.h>
#include <linux/printk.h>
diff --git a/arch/arm/mach-uniphier/dram/ddrphy-training.c b/arch/arm/mach-uniphier/dram/ddrphy-training.c
index c26f56367e..1decdf1cbf 100644
--- a/arch/arm/mach-uniphier/dram/ddrphy-training.c
+++ b/arch/arm/mach-uniphier/dram/ddrphy-training.c
@@ -4,7 +4,6 @@
* Copyright (C) 2015-2016 Socionext Inc.
*/
-#include <log.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/errno.h>
diff --git a/arch/arm/mach-uniphier/dram/umc-pxs2.c b/arch/arm/mach-uniphier/dram/umc-pxs2.c
index 24c6802a27..73574201e3 100644
--- a/arch/arm/mach-uniphier/dram/umc-pxs2.c
+++ b/arch/arm/mach-uniphier/dram/umc-pxs2.c
@@ -7,7 +7,6 @@
* Copyright (C) 2015 Socionext Inc.
*/
-#include <log.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/errno.h>
diff --git a/arch/arm/mach-uniphier/micro-support-card.c b/arch/arm/mach-uniphier/micro-support-card.c
index d23c0bd129..84c377766a 100644
--- a/arch/arm/mach-uniphier/micro-support-card.c
+++ b/arch/arm/mach-uniphier/micro-support-card.c
@@ -8,7 +8,6 @@
#include <common.h>
#include <dm/of.h>
#include <fdt_support.h>
-#include <log.h>
#include <linux/ctype.h>
#include <linux/delay.h>
#include <linux/io.h>
diff --git a/arch/arm/mach-uniphier/nand-reset.c b/arch/arm/mach-uniphier/nand-reset.c
index dbf54aa910..11cadaabd8 100644
--- a/arch/arm/mach-uniphier/nand-reset.c
+++ b/arch/arm/mach-uniphier/nand-reset.c
@@ -4,7 +4,6 @@
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
-#include <log.h>
#include <linux/errno.h>
#include <dm.h>
#include <dm/uclass-internal.h>