diff --git a/cpu/arm920t/s3c24x0/usb.c b/cpu/arm920t/s3c24x0/usb.c
index 8114034..4bc7961 100644
--- a/cpu/arm920t/s3c24x0/usb.c
+++ b/cpu/arm920t/s3c24x0/usb.c
@@ -32,7 +32,7 @@
 # include <s3c2410.h>
 #endif
 
-int usb_cpu_init()
+int usb_cpu_init (void)
 {
 
 	S3C24X0_CLOCK_POWER * const clk_power = S3C24X0_GetBase_CLOCK_POWER();
@@ -53,7 +53,7 @@
 	return 0;
 }
 
-int usb_cpu_stop()
+int usb_cpu_stop (void)
 {
 	S3C24X0_CLOCK_POWER * const clk_power = S3C24X0_GetBase_CLOCK_POWER();
 	/* may not want to do this */
@@ -61,7 +61,7 @@
 	return 0;
 }
 
-int usb_cpu_init_fail()
+int usb_cpu_init_fail (void)
 {
 	S3C24X0_CLOCK_POWER * const clk_power = S3C24X0_GetBase_CLOCK_POWER();
 	clk_power->CLKCON &= ~(1 << 4);
diff --git a/drivers/usb_ohci.h b/drivers/usb_ohci.h
index a1b36ed..68dd4ec 100644
--- a/drivers/usb_ohci.h
+++ b/drivers/usb_ohci.h
@@ -7,18 +7,14 @@
  * usb-ohci.h
  */
 
-/* functions for doing board specific setup/cleanup */
-#ifdef CFG_USB_BOARD_INIT
+/* functions for doing board or CPU specific setup/cleanup */
 extern int usb_board_init(void);
 extern int usb_board_stop(void);
 extern int usb_cpu_init_fail(void);
-#endif
 
-#ifdef CFG_USB_CPU_INIT
 extern int usb_cpu_init(void);
 extern int usb_cpu_stop(void);
 extern int usb_cpu_init_fail(void);
-#endif
 
 
 static int cc_to_error[16] = {