aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2014-06-20 20:55:33 -0400
committerScott Wood <scottwood@freescale.com>2014-06-25 19:49:40 -0400
commit087dfae3fe3fe6f8b18285890eb9255ec8478d52 (patch)
treed6250ed8ad660ba1d882d0e3928c6f436f01ec9c /arch
parent39eb56da2b53bec6720181ed6dc29390a1d91f25 (diff)
powerpc/8xx: Remove empty asm/mpc8xx.h
m8xx_pcmcia_ops was the only thing in this file (other than a comment that describes a usage that doesn't match the file's contents); now that m8xx_pcmcia_ops is gone, remove the empty file. Signed-off-by: Scott Wood <scottwood@freescale.com> Cc: Pantelis Antoniou <pantelis.antoniou@gmail.com> Cc: Vitaly Bordug <vitb@kernel.crashing.org> Cc: netdev@vger.kernel.org
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/include/asm/fs_pd.h1
-rw-r--r--arch/powerpc/include/asm/mpc8xx.h10
-rw-r--r--arch/powerpc/platforms/8xx/m8xx_setup.c1
-rw-r--r--arch/powerpc/platforms/8xx/mpc885ads_setup.c1
-rw-r--r--arch/powerpc/platforms/8xx/tqm8xx_setup.c1
-rw-r--r--arch/powerpc/sysdev/micropatch.c1
6 files changed, 0 insertions, 15 deletions
diff --git a/arch/powerpc/include/asm/fs_pd.h b/arch/powerpc/include/asm/fs_pd.h
index 9361cd5342cc..f79d6c74eb2a 100644
--- a/arch/powerpc/include/asm/fs_pd.h
+++ b/arch/powerpc/include/asm/fs_pd.h
@@ -28,7 +28,6 @@
28 28
29#ifdef CONFIG_8xx 29#ifdef CONFIG_8xx
30#include <asm/8xx_immap.h> 30#include <asm/8xx_immap.h>
31#include <asm/mpc8xx.h>
32 31
33extern immap_t __iomem *mpc8xx_immr; 32extern immap_t __iomem *mpc8xx_immr;
34 33
diff --git a/arch/powerpc/include/asm/mpc8xx.h b/arch/powerpc/include/asm/mpc8xx.h
deleted file mode 100644
index 8ab22e85aba7..000000000000
--- a/arch/powerpc/include/asm/mpc8xx.h
+++ /dev/null
@@ -1,10 +0,0 @@
1/* This is the single file included by all MPC8xx build options.
2 * Since there are many different boards and no standard configuration,
3 * we have a unique include file for each. Rather than change every
4 * file that has to include MPC8xx configuration, they all include
5 * this one and the configuration switching is done here.
6 */
7#ifndef __CONFIG_8xx_DEFS
8#define __CONFIG_8xx_DEFS
9
10#endif /* __CONFIG_8xx_DEFS */
diff --git a/arch/powerpc/platforms/8xx/m8xx_setup.c b/arch/powerpc/platforms/8xx/m8xx_setup.c
index 623bb43f2b48..d3037747031d 100644
--- a/arch/powerpc/platforms/8xx/m8xx_setup.c
+++ b/arch/powerpc/platforms/8xx/m8xx_setup.c
@@ -18,7 +18,6 @@
18#include <linux/fsl_devices.h> 18#include <linux/fsl_devices.h>
19 19
20#include <asm/io.h> 20#include <asm/io.h>
21#include <asm/mpc8xx.h>
22#include <asm/8xx_immap.h> 21#include <asm/8xx_immap.h>
23#include <asm/prom.h> 22#include <asm/prom.h>
24#include <asm/fs_pd.h> 23#include <asm/fs_pd.h>
diff --git a/arch/powerpc/platforms/8xx/mpc885ads_setup.c b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
index 3d5e4e151ca8..5921dcb498fd 100644
--- a/arch/powerpc/platforms/8xx/mpc885ads_setup.c
+++ b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
@@ -35,7 +35,6 @@
35#include <asm/page.h> 35#include <asm/page.h>
36#include <asm/processor.h> 36#include <asm/processor.h>
37#include <asm/time.h> 37#include <asm/time.h>
38#include <asm/mpc8xx.h>
39#include <asm/8xx_immap.h> 38#include <asm/8xx_immap.h>
40#include <asm/cpm1.h> 39#include <asm/cpm1.h>
41#include <asm/fs_pd.h> 40#include <asm/fs_pd.h>
diff --git a/arch/powerpc/platforms/8xx/tqm8xx_setup.c b/arch/powerpc/platforms/8xx/tqm8xx_setup.c
index 251aba8759e4..dda607807def 100644
--- a/arch/powerpc/platforms/8xx/tqm8xx_setup.c
+++ b/arch/powerpc/platforms/8xx/tqm8xx_setup.c
@@ -37,7 +37,6 @@
37#include <asm/page.h> 37#include <asm/page.h>
38#include <asm/processor.h> 38#include <asm/processor.h>
39#include <asm/time.h> 39#include <asm/time.h>
40#include <asm/mpc8xx.h>
41#include <asm/8xx_immap.h> 40#include <asm/8xx_immap.h>
42#include <asm/cpm1.h> 41#include <asm/cpm1.h>
43#include <asm/fs_pd.h> 42#include <asm/fs_pd.h>
diff --git a/arch/powerpc/sysdev/micropatch.c b/arch/powerpc/sysdev/micropatch.c
index c0bb76ef7242..6727dc54d549 100644
--- a/arch/powerpc/sysdev/micropatch.c
+++ b/arch/powerpc/sysdev/micropatch.c
@@ -13,7 +13,6 @@
13#include <linux/mm.h> 13#include <linux/mm.h>
14#include <linux/interrupt.h> 14#include <linux/interrupt.h>
15#include <asm/irq.h> 15#include <asm/irq.h>
16#include <asm/mpc8xx.h>
17#include <asm/page.h> 16#include <asm/page.h>
18#include <asm/pgtable.h> 17#include <asm/pgtable.h>
19#include <asm/8xx_immap.h> 18#include <asm/8xx_immap.h>