Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / 82xx / pq2ads.h

diff --git a/arch/powerpc/platforms/82xx/pq2ads.h b/arch/powerpc/platforms/82xx/pq2ads.h
index 5b5cca6c8c8804d6e847a8b2a0995a9bb1b68d4a..984db42cc8e76e6e964edb7558719bb94afa1630 100644 (file)
--- a/arch/powerpc/platforms/82xx/pq2ads.h
+++ b/arch/powerpc/platforms/82xx/pq2ads.h
@@ -23,11 +23,6 @@
 #define __MACH_ADS8260_DEFS
 
 #include <linux/seq_file.h>
-#include <asm/ppcboot.h>
-
-/* For our show_cpuinfo hooks. */
-#define CPUINFO_VENDOR         "Freescale Semiconductor"
-#define CPUINFO_MACHINE                "PQ2 ADS PowerPC"
 
 /* Backword-compatibility stuff for the drivers */
 #define CPM_MAP_ADDR           ((uint)0xf0000000)
@@ -58,9 +53,5 @@
 #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__ */