]> git.baikalelectronics.ru Git - kernel.git/commit
ARM: prom.h: Fix build error by removing unneeded header file
authorFabio Estevam <festevam@gmail.com>
Mon, 2 Jan 2012 16:19:03 +0000 (14:19 -0200)
committerGrant Likely <grant.likely@secretlab.ca>
Thu, 5 Jan 2012 06:47:52 +0000 (23:47 -0700)
commit8a25394a640e7cf6b3f3bb4bdf84ac7b54c095c5
treed922c779efe6a10d6ef87a468d2b48e9cb34733a
parent42bced23240797ab0cc4e61b21232e37b3719775
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>
arch/arm/include/asm/prom.h
drivers/of/fdt.c