Remove sysdev/commproc.h

Move cpm1 specific prototypes to asm/commproc.h and mpc8xx specific prototypes to asm/mpc8xx.h. Adjust includes accordingly. Remove now unneeded sysdev/commproc.h.

---

arch/powerpc/platforms/8xx/ep88xc.c          |    3 +--
arch/powerpc/platforms/8xx/m8xx_setup.c      |    1 -
arch/powerpc/platforms/8xx/mpc86xads_setup.c |    2 --
arch/powerpc/platforms/8xx/mpc885ads_setup.c |    2 --
arch/powerpc/sysdev/commproc.c               |    1 -
arch/powerpc/sysdev/commproc.h               |   12 ------------
arch/powerpc/sysdev/mpc8xx_pic.c             |    1 -
drivers/net/fs_enet/mac-scc.c                |    1 -
include/asm-powerpc/commproc.h               |    2 ++
include/asm-powerpc/mpc8xx.h                 |    7 +++++++
10 files changed, 10 insertions(+), 22 deletions(-)

delete mode 100644 arch/powerpc/sysdev/commproc.h

index c883c31..9365f07 100644
@@ -16,8 +16,7 @@

#include <asm/io.h>
#include <asm/udbg.h>
#include <asm/commproc.h>
-
-#include <sysdev/commproc.h>
+#include <asm/mpc8xx.h>

struct cpm_pin {
	int port, pin, flags;

index 85abd61..c6a4663 100644
@@ -25,7 +25,6 @@

#include <mm/mmu_decl.h>

#include <sysdev/mpc8xx_pic.h>
-#include <sysdev/commproc.h>

#ifdef CONFIG_PCMCIA_M8XX
struct mpc8xx_pcmcia_ops m8xx_pcmcia_ops;

index dea1df1..7389590 100644
@@ -27,8 +27,6 @@

#include <asm/fs_pd.h>
#include <asm/udbg.h>

-#include <sysdev/commproc.h>
-
#include "mpc86xads.h"

struct cpm_pin {

index 8f2aa04..ae69e93 100644
@@ -40,8 +40,6 @@

#include <asm/fs_pd.h>
#include <asm/udbg.h>

-#include <sysdev/commproc.h>
-
static u32 __iomem *bcsr, *bcsr5;

#ifdef CONFIG_PCMCIA_M8XX

index 818d4b0..ef82587 100644
@@ -30,7 +30,6 @@

#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/module.h>
-#include <asm/mpc8xx.h>
#include <asm/page.h>
#include <asm/pgtable.h>
#include <asm/8xx_immap.h>

deleted file mode 100644
index f481adf..0000000
@@ -1,12 +0,0 @@
-#ifndef _POWERPC_SYSDEV_COMMPROC_H
-#define _POWERPC_SYSDEV_COMMPROC_H
-
-extern void cpm_reset(void);
-extern void mpc8xx_restart(char *cmd);
-extern void mpc8xx_calibrate_decr(void);
-extern int mpc8xx_set_rtc_time(struct rtc_time *tm);
-extern void mpc8xx_get_rtc_time(struct rtc_time *tm);
-extern void mpc8xx_pics_init(void);
-extern unsigned int mpc8xx_get_irq(void);
-
-#endif

index 7aa4ff5..0e74a4b 100644
@@ -10,7 +10,6 @@

#include <asm/irq.h>
#include <asm/io.h>
#include <asm/8xx_immap.h>
-#include <asm/mpc8xx.h>

#include "mpc8xx_pic.h"

index fe3d8a6..1502dbf 100644
@@ -39,7 +39,6 @@

#ifdef CONFIG_8xx
#include <asm/8xx_immap.h>
#include <asm/pgtable.h>
-#include <asm/mpc8xx.h>
#include <asm/commproc.h>
#endif

index 9757521..ec87b8f 100644
@@ -89,6 +89,8 @@ extern void cpm_setbrg(uint brg, uint rate);
 

extern void cpm_load_patch(cpm8xx_t *cp);

+extern void cpm_reset(void);
+
/* Buffer descriptors used by many of the CPM protocols. */
typedef struct cpm_buf_desc {

index 2be014b..2af9fcb 100644
@@ -11,6 +11,13 @@
 

#ifdef CONFIG_8xx

+extern void mpc8xx_restart(char *cmd); +extern void mpc8xx_calibrate_decr(void); +extern int mpc8xx_set_rtc_time(struct rtc_time *tm); +extern void mpc8xx_get_rtc_time(struct rtc_time *tm); +extern void mpc8xx_pics_init(void);
+extern unsigned int mpc8xx_get_irq(void);
+
#ifdef CONFIG_FADS
#include <platforms/fads.h>
#endif

1.5.3.8