vserver 1.9.5.x5

[linux-2.6.git] / arch / arm / mach-ixp2000 / ixdp2800.c

diff --git a/arch/arm/mach-ixp2000/ixdp2800.c b/arch/arm/mach-ixp2000/ixdp2800.c
index 285eaf0..c4683aa 100644 (file)
--- a/arch/arm/mach-ixp2000/ixdp2800.c
+++ b/arch/arm/mach-ixp2000/ixdp2800.c
@@ -23,9 +23,6 @@
 #include <linux/device.h>
 #include <linux/bitops.h>
 #include <linux/pci.h>
-#include <linux/interrupt.h>
-#include <linux/mm.h>
-#include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
@@ -55,11 +52,16 @@ void ixdp2400_init_irq(void)
  * IXDP2800 timer tick
  *************************************************************************/
 
-static void __init ixdp2800_init_time(void)
+static void __init ixdp2800_timer_init(void)
 {
        ixp2000_init_time(50000000);
 }
 
+static struct sys_timer ixdp2800_timer = {
+       .init           = ixdp2800_timer_init,
+       .offset         = ixp2000_gettimeoffset,
+};
+
 /*************************************************************************
  * IXDP2800 PCI
  *************************************************************************/
@@ -111,7 +113,7 @@ static int __init ixdp2800_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
                 * Device behind the first bridge
                 */
                if(dev->bus->self->devfn == IXDP2X00_P2P_DEVFN) {
-                       switch(PCI_SLOT(dev->devfn)) {
+                       switch(dev->devfn) {
                                case IXDP2X00_PMC_DEVFN:
                                        return IRQ_IXDP2800_PMC;        
                        
@@ -172,7 +174,7 @@ MACHINE_START(IXDP2800, "Intel IXDP2800 Development Platform")
        BOOT_PARAMS(0x00000100)
        MAPIO(ixdp2x00_map_io)
        INITIRQ(ixdp2800_init_irq)
-       INITTIME(ixdp2800_init_time)
+       .timer          = &ixdp2800_timer,
        INIT_MACHINE(ixdp2x00_init_machine)
 MACHINE_END