Commit c89810ac authored Jan 02, 2012 by Fabio Estevam Committed by Grant Likely Jan 04, 2012

ARM: prom.h: Fix build error by removing unneeded header file



Fix the following build error:

  CC [M]  fs/udf/balloc.o
In file included from /home/fabio/next/linux-next/arch/arm/include/asm/prom.h:16,
                 from include/linux/of.h:140,
                 from include/asm-generic/gpio.h:7,
                 from arch/arm/plat-mxc/include/mach/irqs.h:14,
                 from /home/fabio/next/linux-next/arch/arm/include/asm/irq.h:4,
                 from /home/fabio/next/linux-next/arch/arm/include/asm/hardirq.h:6,
                 from include/linux/hardirq.h:7,
                 from include/linux/highmem.h:8,
                 from include/linux/pagemap.h:10,
                 from include/linux/buffer_head.h:13,
                 from fs/udf/udfdecl.h:11,
                 from fs/udf/balloc.c:22:
/home/fabio/next/linux-next/arch/arm/include/asm/setup.h:146: error: redefinition of 'struct tag'

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
[grant.likely: fix build failure on drivers/of/fdt.c]
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

parent 93797d87

arch/arm/include/asm/prom.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,6 @@

		#ifdef CONFIG_OF

		#include <asm/setup.h>
		#include <asm/irq.h>

		extern struct machine_desc *setup_machine_fdt(unsigned int dt_phys);

drivers/of/fdt.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@
		#include <linux/errno.h>
		#include <linux/slab.h>

		#include <asm/setup.h> /* for COMMAND_LINE_SIZE */
		#ifdef CONFIG_PPC
		#include <asm/machdep.h>
		#endif /* CONFIG_PPC */

Admin message