Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c9f303e authored by Rob Herring's avatar Rob Herring
Browse files

microblaze: clean-up prom.h implicit includes 



While powerpc is a mess of implicit includes by prom.h, microblaze just
copied this and is easily fixed. Add the necessary explicit includes and
remove unnecessary includes and other parts from prom.h

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Acked-by: default avatarGrant Likely <grant.likely@linaro.org>
Cc: Michal Simek <monstr@monstr.eu>
Cc: microblaze-uclinux@itee.uq.edu.au
Cc: netdev@vger.kernel.org
parent 7b009939

arch/microblaze/include/asm/prom.h

+1 −27
Original line number Diff line number Diff line
@@ -11,17 +11,10 @@ 
 * as published by the Free Software Foundation; either version

 * 2 of the License, or (at your option) any later version.

 */



#include <linux/of.h>	/* linux/of.h gets to determine #include ordering */



#ifndef _ASM_MICROBLAZE_PROM_H

#define _ASM_MICROBLAZE_PROM_H

#ifdef __KERNEL__

#ifndef __ASSEMBLY__



#include <linux/types.h>

#include <asm/irq.h>

#include <linux/atomic.h>

#include <linux/of.h>



#define HAVE_ARCH_DEVTREE_FIXUPS
@@ -42,23 +35,4 @@ extern unsigned long pci_address_to_pio(phys_addr_t address); 
#define pci_address_to_pio pci_address_to_pio

#endif	/* CONFIG_PCI */



/* Parse the ibm,dma-window property of an OF node into the busno, phys and

 * size parameters.

 */

void of_parse_dma_window(struct device_node *dn, const void *dma_window_prop,

		unsigned long *busno, unsigned long *phys, unsigned long *size);



extern void kdump_move_device_tree(void);



#endif /* __ASSEMBLY__ */

#endif /* __KERNEL__ */



/* These includes are put at the bottom because they may contain things

 * that are overridden by this file.  Ideally they shouldn't be included

 * by this file, but there are a bunch of .c files that currently depend

 * on it.  Eventually they will be cleaned up. */

#include <linux/of_fdt.h>

#include <linux/of_irq.h>

#include <linux/platform_device.h>



#endif /* _ASM_MICROBLAZE_PROM_H */

arch/microblaze/kernel/prom.c

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/debugfs.h>

#include <linux/irq.h>

#include <linux/memblock.h>

#include <linux/of_fdt.h>



#include <asm/prom.h>

#include <asm/page.h>

arch/microblaze/kernel/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/initrd.h>

#include <linux/console.h>

#include <linux/debugfs.h>

#include <linux/of_fdt.h>



#include <asm/setup.h>

#include <asm/sections.h>

arch/microblaze/kernel/timer.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/clk.h>

#include <linux/clockchips.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>

#include <asm/cpuinfo.h>

#include <linux/cnt32_to_63.h>

arch/microblaze/pci/pci-common.c

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/slab.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>

#include <linux/of_pci.h>

#include <linux/export.h>