Merge commit 'v2.6.37-rc2' into sched/core

[pandora-kernel.git] / arch / m68knommu / platform / 68VZ328 / config.c

diff --git a/arch/m68knommu/platform/68VZ328/config.c b/arch/m68knommu/platform/68VZ328/config.c
index 79dced9..eabaabe 100644 (file)
--- a/arch/m68knommu/platform/68VZ328/config.c
+++ b/arch/m68knommu/platform/68VZ328/config.c
@@ -16,17 +16,13 @@
 
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/tty.h>
-#include <linux/console.h>
 #include <linux/kd.h>
 #include <linux/netdevice.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 
-#include <asm/setup.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
-#include <asm/irq.h>
 #include <asm/machdep.h>
 #include <asm/MC68VZ328.h>
 #include <asm/bootstd.h>
@@ -37,9 +33,6 @@
 
 /***************************************************************************/
 
-void m68328_timer_init(irq_handler_t timer_routine);
-void m68328_timer_tick(void);
-unsigned long m68328_timer_gettimeoffset(void);
 void m68328_timer_gettod(int *year, int *mon, int *day, int *hour, int *min, int *sec);
 
 /***************************************************************************/
@@ -97,11 +90,6 @@ static void init_hardware(char *command, int size)
        PDIQEG &= ~PD(1);
        PDIRQEN |= PD(1);                       /* IRQ enabled */
 
-#ifdef CONFIG_68328_SERIAL_UART2
-       /* Enable RXD TXD port bits to enable UART2 */
-       PJSEL &= ~(PJ(5) | PJ(4));
-#endif
-
 #ifdef CONFIG_INIT_LCD
        /* initialize LCD controller */
        LSSA = (long) screen_bits;
@@ -193,9 +181,6 @@ void config_BSP(char *command, int size)
 
        init_hardware(command, size);
 
-       mach_sched_init = (void *) m68328_timer_init;
-       mach_tick = m68328_timer_tick;
-       mach_gettimeoffset = m68328_timer_gettimeoffset;
        mach_gettod = m68328_timer_gettod;
        mach_reset = m68vz328_reset;
 }