diff --git a/[refs] b/[refs] index 203c85664055..237b297dc59d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5274c2d0d8d91076af8605187d762dfa0b92825 +refs/heads/master: 5936d1161ff503a1170722fe9b2d9ac4da700eef diff --git a/trunk/arch/arm/include/asm/prom.h b/trunk/arch/arm/include/asm/prom.h index ee0363307918..aeae9c609df4 100644 --- a/trunk/arch/arm/include/asm/prom.h +++ b/trunk/arch/arm/include/asm/prom.h @@ -13,8 +13,6 @@ #ifdef CONFIG_OF -#include - extern struct machine_desc *setup_machine_fdt(unsigned int dt_phys); extern void arm_dt_memblock_reserve(void);