Skip to contentSkip to conversation

microblaze: heartbeat: fix missing prom.h include

PATCH In review Rob Herring 2 participants 2 messages Jun 11, 2018 – Jun 12, 2018 Microblaze architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 microblaze: heartbeat: fix missing prom.h include

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")
Cc Michal Simek <[email protected]>
---
 arch/microblaze/kernel/heartbeat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/microblaze/kernel/heartbeat.c +1 -1
index 2022130139d2..87aa942eee8c 100644
@@ -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;
 
Signature · 1 line
2.17.1
maintainer
#1 lore raw
Quoted 19 lines · Rob Herring

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")
Cc Michal Simek <[email protected]>
---
 arch/microblaze/kernel/heartbeat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/microblaze/kernel/heartbeat.c +0 -0
index 2022130139d2..87aa942eee8c 100644
@@ -11,10 +11,10 @@
 #include <linux/sched.h>

arch/microblaze/kernel/heartbeat.c line 20

Quoted 10 lines
arch/microblaze/kernel/heartbeat.c +1 -1
 #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

Signature · 5 lines
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