Changed the mp2usb (at91rm9200) board to use the generic OHCI driver. Some
fixes to the latter.
diff --git a/cpu/pxa/usb.c b/cpu/pxa/usb.c
index e89391c..1716157 100644
--- a/cpu/pxa/usb.c
+++ b/cpu/pxa/usb.c
@@ -22,10 +22,12 @@
  */
 
 #include <common.h>
-#include <asm/arch/pxa-regs.h>
 
-#ifdef CFG_USB_CPU_INIT
+#if defined(CONFIG_USB_OHCI) && defined(CFG_USB_OHCI_CPU_INIT)
 # ifdef CONFIG_CPU_MONAHANS
+
+#include <asm/arch/pxa-regs.h>
+
 int usb_cpu_init()
 {
 	/* Enable USB host clock. */
@@ -68,4 +70,4 @@
 	return 0;
 }
 # endif /* CONFIG_CPU_MONAHANS */
-#endif /* CFG_USB_CPU_INIT */
+#endif /* defined(CONFIG_USB_OHCI) && defined(CFG_USB_OHCI_CPU_INIT) */