tag ba256fd02113b2ba504b4e0cdd3ce2be2a4e8e79
tagger Grant Likely <grant.likely@secretlab.ca> Thu Jan 05 00:07:36 2012 -0700
object c89810acbcf48c7004e912b2b4b862480b2d00e1

devicetree/next changes queued for v3.3 merge window

commit c89810acbcf48c7004e912b2b4b862480b2d00e1
author Fabio Estevam <festevam@gmail.com> Mon Jan 02 14:19:03 2012 -0200
committer Grant Likely <grant.likely@secretlab.ca> Wed Jan 04 23:47:52 2012 -0700
tree d922c779efe6a10d6ef87a468d2b48e9cb34733a
parent 93797d87d63d36404907640e4e20bb976bff4744

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>