Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit ed16c20da6f500bc2dfad933078d2987636a7b60

Authored by Kumar Gala
1 parent 5b072ba453

[POWERPC] Remove old includes from arch/ppc 

Remove includes of files that existed in arch/ppc that we dont need in
arch/powerpc anymore.  The following includes were removed:

 <asm/amigappc.h>
 <asm/bootinfo.h>
 <asm/ppcboot.h>
 <asm/ppc_sys.h>
 <asm/residual.h>
 <asm/m8260_pci.h>

This also caused platforms/embedded6xx/mpc7448_hpc2.h to no longer be
needed and thus removed.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

Showing 23 changed files with 2 additions and 46 deletions Side-by-side Diff

arch/powerpc/kernel/setup_32.c
Diff comments   View file @ ed16c20
... ... @@ -18,13 +18,11 @@
18 18 #include <linux/cpu.h>
19 19 #include <linux/console.h>
20 20  
21   -#include <asm/residual.h>
22 21 #include <asm/io.h>
23 22 #include <asm/prom.h>
24 23 #include <asm/processor.h>
25 24 #include <asm/pgtable.h>
26 25 #include <asm/setup.h>
27   -#include <asm/amigappc.h>
28 26 #include <asm/smp.h>
29 27 #include <asm/elf.h>
30 28 #include <asm/cputable.h>
arch/powerpc/platforms/52xx/lite5200.c
Diff comments   View file @ ed16c20
... ... @@ -35,7 +35,6 @@
35 35 #include <asm/io.h>
36 36 #include <asm/machdep.h>
37 37 #include <asm/ipic.h>
38   -#include <asm/bootinfo.h>
39 38 #include <asm/irq.h>
40 39 #include <asm/prom.h>
41 40 #include <asm/udbg.h>
arch/powerpc/platforms/82xx/m82xx_pci.h
Diff comments   View file @ ed16c20
... ... @@ -8,8 +8,6 @@
8 8 * 2 of the License, or (at your option) any later version.
9 9 */
10 10  
11   -#include <asm/m8260_pci.h>
12   -
13 11 #define SIU_INT_IRQ1 ((uint)0x13 + CPM_IRQ_OFFSET)
14 12  
15 13 #ifndef _IO_BASE
arch/powerpc/platforms/82xx/mpc82xx.c
Diff comments   View file @ ed16c20
... ... @@ -36,7 +36,6 @@
36 36 #include <asm/time.h>
37 37 #include <asm/io.h>
38 38 #include <asm/machdep.h>
39   -#include <asm/bootinfo.h>
40 39 #include <asm/pci-bridge.h>
41 40 #include <asm/mpc8260.h>
42 41 #include <asm/irq.h>
arch/powerpc/platforms/82xx/mpc82xx_ads.c
Diff comments   View file @ ed16c20
... ... @@ -37,7 +37,6 @@
37 37 #include <asm/time.h>
38 38 #include <asm/io.h>
39 39 #include <asm/machdep.h>
40   -#include <asm/bootinfo.h>
41 40 #include <asm/pci-bridge.h>
42 41 #include <asm/mpc8260.h>
43 42 #include <asm/irq.h>
arch/powerpc/platforms/82xx/pq2ads.h
Diff comments   View file @ ed16c20
... ... @@ -23,7 +23,6 @@
23 23 #define __MACH_ADS8260_DEFS
24 24  
25 25 #include <linux/seq_file.h>
26   -#include <asm/ppcboot.h>
27 26  
28 27 /* For our show_cpuinfo hooks. */
29 28 #define CPUINFO_VENDOR "Freescale Semiconductor"
arch/powerpc/platforms/83xx/mpc832x_mds.c
Diff comments   View file @ ed16c20
... ... @@ -32,7 +32,6 @@
32 32 #include <asm/io.h>
33 33 #include <asm/machdep.h>
34 34 #include <asm/ipic.h>
35   -#include <asm/bootinfo.h>
36 35 #include <asm/irq.h>
37 36 #include <asm/prom.h>
38 37 #include <asm/udbg.h>
arch/powerpc/platforms/83xx/mpc834x_itx.c
Diff comments   View file @ ed16c20
... ... @@ -30,7 +30,6 @@
30 30 #include <asm/io.h>
31 31 #include <asm/machdep.h>
32 32 #include <asm/ipic.h>
33   -#include <asm/bootinfo.h>
34 33 #include <asm/irq.h>
35 34 #include <asm/prom.h>
36 35 #include <asm/udbg.h>
arch/powerpc/platforms/83xx/mpc834x_mds.c
Diff comments   View file @ ed16c20
... ... @@ -30,7 +30,6 @@
30 30 #include <asm/io.h>
31 31 #include <asm/machdep.h>
32 32 #include <asm/ipic.h>
33   -#include <asm/bootinfo.h>
34 33 #include <asm/irq.h>
35 34 #include <asm/prom.h>
36 35 #include <asm/udbg.h>
arch/powerpc/platforms/83xx/mpc836x_mds.c
Diff comments   View file @ ed16c20
... ... @@ -38,7 +38,6 @@
38 38 #include <asm/io.h>
39 39 #include <asm/machdep.h>
40 40 #include <asm/ipic.h>
41   -#include <asm/bootinfo.h>
42 41 #include <asm/irq.h>
43 42 #include <asm/prom.h>
44 43 #include <asm/udbg.h>
arch/powerpc/platforms/85xx/mpc85xx_cds.c
Diff comments   View file @ ed16c20
... ... @@ -35,7 +35,6 @@
35 35 #include <asm/io.h>
36 36 #include <asm/machdep.h>
37 37 #include <asm/ipic.h>
38   -#include <asm/bootinfo.h>
39 38 #include <asm/pci-bridge.h>
40 39 #include <asm/mpc85xx.h>
41 40 #include <asm/irq.h>
arch/powerpc/platforms/85xx/mpc85xx_mds.c
Diff comments   View file @ ed16c20
... ... @@ -38,7 +38,6 @@
38 38 #include <asm/time.h>
39 39 #include <asm/io.h>
40 40 #include <asm/machdep.h>
41   -#include <asm/bootinfo.h>
42 41 #include <asm/pci-bridge.h>
43 42 #include <asm/mpc85xx.h>
44 43 #include <asm/irq.h>
arch/powerpc/platforms/8xx/m8xx_setup.c
Diff comments   View file @ ed16c20
... ... @@ -36,13 +36,11 @@
36 36  
37 37 #include <asm/mmu.h>
38 38 #include <asm/reg.h>
39   -#include <asm/residual.h>
40 39 #include <asm/io.h>
41 40 #include <asm/pgtable.h>
42 41 #include <asm/mpc8xx.h>
43 42 #include <asm/8xx_immap.h>
44 43 #include <asm/machdep.h>
45   -#include <asm/bootinfo.h>
46 44 #include <asm/time.h>
47 45 #include <asm/prom.h>
48 46 #include <asm/fs_pd.h>
49 47  
... ... @@ -55,7 +53,9 @@
55 53 #endif
56 54  
57 55 void m8xx_calibrate_decr(void);
  56 +#ifdef CONFIG_8xx_WDT
58 57 extern void m8xx_wdt_handler_install(bd_t *bp);
  58 +#endif
59 59 extern int cpm_pic_init(void);
60 60 extern int cpm_get_irq(void);
61 61  
arch/powerpc/platforms/8xx/mpc86xads.h
Diff comments   View file @ ed16c20
... ... @@ -15,7 +15,6 @@
15 15 #ifndef __ASM_MPC86XADS_H__
16 16 #define __ASM_MPC86XADS_H__
17 17  
18   -#include <asm/ppcboot.h>
19 18 #include <sysdev/fsl_soc.h>
20 19  
21 20 /* U-Boot maps BCSR to 0xff080000 */
arch/powerpc/platforms/8xx/mpc86xads_setup.c
Diff comments   View file @ ed16c20
... ... @@ -31,7 +31,6 @@
31 31 #include <asm/processor.h>
32 32 #include <asm/system.h>
33 33 #include <asm/time.h>
34   -#include <asm/ppcboot.h>
35 34 #include <asm/mpc8xx.h>
36 35 #include <asm/8xx_immap.h>
37 36 #include <asm/commproc.h>
arch/powerpc/platforms/8xx/mpc885ads.h
Diff comments   View file @ ed16c20
... ... @@ -15,7 +15,6 @@
15 15 #ifndef __ASM_MPC885ADS_H__
16 16 #define __ASM_MPC885ADS_H__
17 17  
18   -#include <asm/ppcboot.h>
19 18 #include <sysdev/fsl_soc.h>
20 19  
21 20 /* U-Boot maps BCSR to 0xff080000 */
arch/powerpc/platforms/8xx/mpc885ads_setup.c
Diff comments   View file @ ed16c20
... ... @@ -32,7 +32,6 @@
32 32 #include <asm/processor.h>
33 33 #include <asm/system.h>
34 34 #include <asm/time.h>
35   -#include <asm/ppcboot.h>
36 35 #include <asm/mpc8xx.h>
37 36 #include <asm/8xx_immap.h>
38 37 #include <asm/commproc.h>
arch/powerpc/platforms/chrp/smp.c
Diff comments   View file @ ed16c20
... ... @@ -26,7 +26,6 @@
26 26 #include <asm/io.h>
27 27 #include <asm/prom.h>
28 28 #include <asm/smp.h>
29   -#include <asm/residual.h>
30 29 #include <asm/time.h>
31 30 #include <asm/machdep.h>
32 31 #include <asm/mpic.h>
arch/powerpc/platforms/embedded6xx/ls_uart.c
Diff comments   View file @ ed16c20
... ... @@ -5,7 +5,6 @@
5 5 #include <linux/serial_8250.h>
6 6 #include <asm/io.h>
7 7 #include <asm/mpc10x.h>
8   -#include <asm/ppc_sys.h>
9 8 #include <asm/prom.h>
10 9 #include <asm/termbits.h>
11 10  
arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
Diff comments   View file @ ed16c20
... ... @@ -40,7 +40,6 @@
40 40 #include <asm/pci-bridge.h>
41 41 #include <asm/reg.h>
42 42 #include <mm/mmu_decl.h>
43   -#include "mpc7448_hpc2.h"
44 43 #include <asm/tsi108_pci.h>
45 44 #include <asm/tsi108_irq.h>
46 45 #include <asm/mpic.h>
arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.h
View file @ ed16c20
1   -/*
2   - * mpc7448_hpc2.h
3   - *
4   - * Definitions for Freescale MPC7448_HPC2 platform
5   - *
6   - * Author: Jacob Pan
7   - * jacob.pan@freescale.com
8   - * Maintainer: Roy Zang <roy.zang@freescale.com>
9   - *
10   - * 2006 (c) Freescale Semiconductor, Inc. This file is licensed under
11   - * the terms of the GNU General Public License version 2. This program
12   - * is licensed "as is" without any warranty of any kind, whether express
13   - * or implied.
14   - */
15   -
16   -#ifndef __PPC_PLATFORMS_MPC7448_HPC2_H
17   -#define __PPC_PLATFORMS_MPC7448_HPC2_H
18   -
19   -#include <asm/ppcboot.h>
20   -
21   -#endif /* __PPC_PLATFORMS_MPC7448_HPC2_H */
arch/powerpc/platforms/powermac/bootx_init.c
Diff comments   View file @ ed16c20
... ... @@ -17,7 +17,6 @@
17 17 #include <asm/prom.h>
18 18 #include <asm/page.h>
19 19 #include <asm/bootx.h>
20   -#include <asm/bootinfo.h>
21 20 #include <asm/btext.h>
22 21 #include <asm/io.h>
23 22  
drivers/macintosh/adb-iop.c
Diff comments   View file @ ed16c20
... ... @@ -19,7 +19,6 @@
19 19 #include <linux/init.h>
20 20 #include <linux/proc_fs.h>
21 21  
22   -#include <asm/bootinfo.h>
23 22 #include <asm/macintosh.h>
24 23 #include <asm/macints.h>
25 24 #include <asm/mac_iop.h>