diff options
author | linuxppc@jdl.com <linuxppc@jdl.com> | 2005-09-19 10:32:07 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-09-21 05:21:09 -0400 |
commit | 3e57615bb5a8b6208627049884ee441f6d05905e (patch) | |
tree | ce59d350bcb9e9fa6469b3bdefc7f25b3897bfa3 /arch/ppc/platforms/85xx | |
parent | c7aeffc4d38f0573b05bf5ebd2f037997ec9d075 (diff) |
[PATCH] powerpc: Revised merge asm-ppc*/hardirq.h
This is a revised patch to merge asm-ppc*/hardirq.h.
It removes some unnecessary #includes, but then requires
the addition of #include <asm/irq.h> in PPC32's hw_irq.h
much like ppc64 already does. Furthermore, several
unnecessary #includes were removed from some ppc32 boards
in order to break resulting bad #include cycles.
Builds pSeries_defconfig and all ppc32 platforms except
the already b0rken bseip.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc/platforms/85xx')
-rw-r--r-- | arch/ppc/platforms/85xx/mpc85xx_ads_common.h | 1 | ||||
-rw-r--r-- | arch/ppc/platforms/85xx/stx_gp3.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/ppc/platforms/85xx/mpc85xx_ads_common.h b/arch/ppc/platforms/85xx/mpc85xx_ads_common.h index 3875e839cff7..84acf6e8d45e 100644 --- a/arch/ppc/platforms/85xx/mpc85xx_ads_common.h +++ b/arch/ppc/platforms/85xx/mpc85xx_ads_common.h | |||
@@ -19,7 +19,6 @@ | |||
19 | 19 | ||
20 | #include <linux/config.h> | 20 | #include <linux/config.h> |
21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
22 | #include <linux/seq_file.h> | ||
23 | #include <asm/ppcboot.h> | 22 | #include <asm/ppcboot.h> |
24 | 23 | ||
25 | #define BOARD_CCSRBAR ((uint)0xe0000000) | 24 | #define BOARD_CCSRBAR ((uint)0xe0000000) |
diff --git a/arch/ppc/platforms/85xx/stx_gp3.h b/arch/ppc/platforms/85xx/stx_gp3.h index 7bcc6c35a417..95fdf4b0680b 100644 --- a/arch/ppc/platforms/85xx/stx_gp3.h +++ b/arch/ppc/platforms/85xx/stx_gp3.h | |||
@@ -21,7 +21,6 @@ | |||
21 | 21 | ||
22 | #include <linux/config.h> | 22 | #include <linux/config.h> |
23 | #include <linux/init.h> | 23 | #include <linux/init.h> |
24 | #include <linux/seq_file.h> | ||
25 | #include <asm/ppcboot.h> | 24 | #include <asm/ppcboot.h> |
26 | 25 | ||
27 | #define BOARD_CCSRBAR ((uint)0xe0000000) | 26 | #define BOARD_CCSRBAR ((uint)0xe0000000) |