Merge branch 'for_rmk' of git://git.mnementh.co.uk/linux-2.6-im into devel

[mirror_ubuntu-zesty-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 2feeef81d84328ee3a3a3414718264b7f418b386..8ceaf5ac6e2ca405bc4843b7f66fb8141807c8b3 100644 (file)
--- a/arch/arm/mach-ks8695/board-micrel.c
+++ b/arch/arm/mach-ks8695/board-micrel.c
@@ -18,7 +18,8 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/devices.h>
+#include <mach/gpio.h>
+#include <mach/devices.h>
 
 #include "generic.h"
 
@@ -39,8 +40,10 @@ static void __init micrel_init(void)
 {
        printk(KERN_INFO "Micrel KS8695 Development Board initializing\n");
 
+       ks8695_register_gpios();
+
 #ifdef CONFIG_PCI
-//     ks8695_init_pci(&micrel_pci);
+       ks8695_init_pci(&micrel_pci);
 #endif
 
        /* Add devices */