diff options
author | Fabio Estevam <festevam@gmail.com> | 2012-01-02 11:19:03 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2012-01-05 01:47:52 -0500 |
commit | c89810acbcf48c7004e912b2b4b862480b2d00e1 (patch) | |
tree | d922c779efe6a10d6ef87a468d2b48e9cb34733a | |
parent | 93797d87d63d36404907640e4e20bb976bff4744 (diff) |
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>
-rw-r--r-- | arch/arm/include/asm/prom.h | 1 | ||||
-rw-r--r-- | drivers/of/fdt.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/prom.h b/arch/arm/include/asm/prom.h index 6f65ca86a5ec..ee0363307918 100644 --- a/arch/arm/include/asm/prom.h +++ b/arch/arm/include/asm/prom.h | |||
@@ -13,7 +13,6 @@ | |||
13 | 13 | ||
14 | #ifdef CONFIG_OF | 14 | #ifdef CONFIG_OF |
15 | 15 | ||
16 | #include <asm/setup.h> | ||
17 | #include <asm/irq.h> | 16 | #include <asm/irq.h> |
18 | 17 | ||
19 | extern struct machine_desc *setup_machine_fdt(unsigned int dt_phys); | 18 | extern struct machine_desc *setup_machine_fdt(unsigned int dt_phys); |
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 7dc8e6da858d..91a375fb6ae6 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
19 | #include <linux/slab.h> | 19 | #include <linux/slab.h> |
20 | 20 | ||
21 | #include <asm/setup.h> /* for COMMAND_LINE_SIZE */ | ||
21 | #ifdef CONFIG_PPC | 22 | #ifdef CONFIG_PPC |
22 | #include <asm/machdep.h> | 23 | #include <asm/machdep.h> |
23 | #endif /* CONFIG_PPC */ | 24 | #endif /* CONFIG_PPC */ |