| Message ID | 20180611145836.21128-1-robh@kernel.org |
|---|---|
| State | Accepted |
| Commit | 71ab91157e9d849a5a0c5fcd1ce68d236c3ca703 |
| Headers | show |
| Series | microblaze: heartbeat: fix missing prom.h include | expand |
On 11.6.2018 16:58, Rob Herring wrote: > Since commit 96f0e6fcc9ad ("microblaze: remove redundant early_printk > support") prom.h was removed and one instance in heartbeat.c remained. > Include of.h as it is the actual header needed. > > Fixes: 96f0e6fcc9ad ("microblaze: remove redundant early_printk support") > Reported-by: kbuild test robot <lkp@intel.com> > Cc: Michal Simek <monstr@monstr.eu> > Signed-off-by: Rob Herring <robh@kernel.org> > --- > arch/microblaze/kernel/heartbeat.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/microblaze/kernel/heartbeat.c b/arch/microblaze/kernel/heartbeat.c > index 2022130139d2..87aa942eee8c 100644 > --- a/arch/microblaze/kernel/heartbeat.c > +++ b/arch/microblaze/kernel/heartbeat.c > @@ -11,10 +11,10 @@ > #include <linux/sched.h> > #include <linux/sched/loadavg.h> > #include <linux/io.h> > +#include <linux/of.h> > > #include <asm/setup.h> > #include <asm/page.h> > -#include <asm/prom.h> > > static unsigned int base_addr; > > Applied before heartbeat removal patch I sent yesterday. Thanks, Michal -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP SoCs
diff --git a/arch/microblaze/kernel/heartbeat.c b/arch/microblaze/kernel/heartbeat.c index 2022130139d2..87aa942eee8c 100644 --- a/arch/microblaze/kernel/heartbeat.c +++ b/arch/microblaze/kernel/heartbeat.c @@ -11,10 +11,10 @@ #include <linux/sched.h> #include <linux/sched/loadavg.h> #include <linux/io.h> +#include <linux/of.h> #include <asm/setup.h> #include <asm/page.h> -#include <asm/prom.h> static unsigned int base_addr;
Since commit 96f0e6fcc9ad ("microblaze: remove redundant early_printk support") prom.h was removed and one instance in heartbeat.c remained. Include of.h as it is the actual header needed. Fixes: 96f0e6fcc9ad ("microblaze: remove redundant early_printk support") Reported-by: kbuild test robot <lkp@intel.com> Cc: Michal Simek <monstr@monstr.eu> Signed-off-by: Rob Herring <robh@kernel.org> --- arch/microblaze/kernel/heartbeat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1