[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <158934051438.215346.17117203400874095019@swboyd.mtv.corp.google.com>
Date: Tue, 12 May 2020 20:28:34 -0700
From: Stephen Boyd <sboyd@...nel.org>
To: Mike Turquette <mturquette@...libre.com>,
Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Linux Next Mailing List <linux-next@...r.kernel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: build failure after merge of the clk tree
Quoting Stephen Rothwell (2020-05-10 17:55:56)
> Hi all,
>
> After merging the clk tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> arch/arm/mach-mmp/time.c:37:10: fatal error: clock.h: No such file or directory
> 37 | #include "clock.h"
> | ^~~~~~~~~
>
> Caused by commit
>
> e4d1fdf89751 ("ARM: mmp: Remove legacy clk code")
>
> I have disabled CONFIG_ARCH_MPP for today. (For some reason, this
> build error did not show up until several more trees had been merged
> ...)
>
Ok yeah I removed that clock.h file and then forgot to find any users of
the header file.
---8<----
diff --git a/arch/arm/mach-mmp/pxa168.c b/arch/arm/mach-mmp/pxa168.c
index b642e900727a..1e9389245d0e 100644
--- a/arch/arm/mach-mmp/pxa168.c
+++ b/arch/arm/mach-mmp/pxa168.c
@@ -19,7 +19,6 @@
#include <asm/system_misc.h>
#include "addr-map.h"
-#include "clock.h"
#include "common.h"
#include <linux/soc/mmp/cputype.h>
#include "devices.h"
diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c
index 049a65f47b42..41b2e8abc9e6 100644
--- a/arch/arm/mach-mmp/time.c
+++ b/arch/arm/mach-mmp/time.c
@@ -34,7 +34,6 @@
#include "regs-apbc.h"
#include "irqs.h"
#include <linux/soc/mmp/cputype.h>
-#include "clock.h"
#define TIMERS_VIRT_BASE TIMERS1_VIRT_BASE
Powered by blists - more mailing lists