Merge commit 'v2.6.27-rc8' into x86/setup

[pandora-kernel.git] / arch / arm / mach-ks8695 / board-micrel.c

diff --git a/arch/arm/mach-ks8695/board-micrel.c b/arch/arm/mach-ks8695/board-micrel.c
index 2feeef8..0468e93 100644 (file)
--- a/arch/arm/mach-ks8695/board-micrel.c
+++ b/arch/arm/mach-ks8695/board-micrel.c
@@ -18,7 +18,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/devices.h>
+#include <mach/devices.h>
 
 #include "generic.h"
 
@@ -40,7 +40,7 @@ static void __init micrel_init(void)
        printk(KERN_INFO "Micrel KS8695 Development Board initializing\n");
 
 #ifdef CONFIG_PCI
-//     ks8695_init_pci(&micrel_pci);
+       ks8695_init_pci(&micrel_pci);
 #endif
 
        /* Add devices */