[POWERPC] Register udbg console early on pseries LPAR

[safe/jmp/linux-2.6] / arch / powerpc / platforms / 82xx / pq2ads.h

diff --git a/arch/powerpc/platforms/82xx/pq2ads.h b/arch/powerpc/platforms/82xx/pq2ads.h
index a734821..984db42 100644 (file)
--- a/arch/powerpc/platforms/82xx/pq2ads.h
+++ b/arch/powerpc/platforms/82xx/pq2ads.h
@@ -22,13 +22,7 @@
 #ifndef __MACH_ADS8260_DEFS
 #define __MACH_ADS8260_DEFS
 
-#include <linux/config.h>
-
-#include <asm/ppcboot.h>
-
-/* For our show_cpuinfo hooks. */
-#define CPUINFO_VENDOR         "Freescale Semiconductor"
-#define CPUINFO_MACHINE                "PQ2 ADS PowerPC"
+#include <linux/seq_file.h>
 
 /* Backword-compatibility stuff for the drivers */
 #define CPM_MAP_ADDR           ((uint)0xf0000000)
@@ -48,20 +42,16 @@
 #define BCSR1_RS232_EN1                ((uint)0x02000000)      /* 0 ==enable */
 #define BCSR1_RS232_EN2                ((uint)0x01000000)      /* 0 ==enable */
 #define BCSR3_FETHIEN2         ((uint)0x10000000)      /* 0 == enable*/
-#define BCSR3_FETH2_RS         ((uint)0x80000000)      /* 0 == reset */
+#define BCSR3_FETH2_RST                ((uint)0x80000000)      /* 0 == reset */
 
 /* cpm serial driver works with constants below */
 
 #define SIU_INT_SMC1           ((uint)0x04+CPM_IRQ_OFFSET)
-#define SIU_INT_SMC2i          ((uint)0x05+CPM_IRQ_OFFSET)
+#define SIU_INT_SMC2           ((uint)0x05+CPM_IRQ_OFFSET)
 #define SIU_INT_SCC1           ((uint)0x28+CPM_IRQ_OFFSET)
 #define SIU_INT_SCC2           ((uint)0x29+CPM_IRQ_OFFSET)
 #define SIU_INT_SCC3           ((uint)0x2a+CPM_IRQ_OFFSET)
 #define SIU_INT_SCC4           ((uint)0x2b+CPM_IRQ_OFFSET)
 
-void m82xx_pci_init_irq(void);
-void mpc82xx_ads_show_cpuinfo(struct seq_file*);
-void m82xx_calibrate_decr(void);
-
 #endif /* __MACH_ADS8260_DEFS */
 #endif /* __KERNEL__ */