diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 2bdbb59..c67a490 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -25,10 +25,11 @@
 
 LIB	:= $(obj)libusb.a
 
+COBJS-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o
+
 COBJS-y += isp116x-hcd.o
 COBJS-y += sl811_usb.o
 COBJS-y += usb_ohci.o
-COBJS-y += r8a66597-hcd.o
 COBJS-y += usbdcore.o
 COBJS-y += usbdcore_ep0.o
 COBJS-y += usbdcore_mpc8xx.o
diff --git a/drivers/usb/r8a66597-hcd.c b/drivers/usb/r8a66597-hcd.c
index 3eb4cb0..0d3931e 100644
--- a/drivers/usb/r8a66597-hcd.c
+++ b/drivers/usb/r8a66597-hcd.c
@@ -24,8 +24,6 @@
 
 #include "r8a66597.h"
 
-#if defined(CONFIG_USB_R8A66597_HCD)
-
 #ifdef R8A66597_DEBUG
 #define R8A66597_DPRINT		printf
 #else
@@ -919,6 +917,3 @@
 
 	return 0;
 }
-
-#endif	/* CONFIG_USB_R8A66597_HCD */
-