USB: Build USB init code based on config entry, clean-up Makefile

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / usb-ehci.c

diff --git a/arch/arm/mach-omap2/usb-ehci.c b/arch/arm/mach-omap2/usb-ehci.c
index d6333c528f34c2da3149b2f9436452469ff233df..23fe8578d2a84f4f5c30af164d1673b4d1274426 100644 (file)
--- a/arch/arm/mach-omap2/usb-ehci.c
+++ b/arch/arm/mach-omap2/usb-ehci.c
@@ -28,7 +28,6 @@
 #include <mach/pm.h>
 #include <mach/usb.h>
 
-#if    defined(CONFIG_USB_EHCI_HCD) || defined(CONFIG_USB_EHCI_HCD_MODULE)
 static struct resource ehci_resources[] = {
        [0] = {
                .start   = OMAP34XX_HSUSB_HOST_BASE + 0x800,
@@ -54,7 +53,6 @@ static struct platform_device ehci_device = {
        .resource       = ehci_resources,
 };
 
-
 /* MUX settings for EHCI pins */
 /*
  * setup_ehci_io_mux - initialize IO pad mux for USBHOST
@@ -147,11 +145,8 @@ static void setup_ehci_io_mux(void)
        return;
 }
 
-#endif /* EHCI specific data */
-
 void __init usb_ehci_init(void)
 {
-#if     defined(CONFIG_USB_EHCI_HCD) || defined(CONFIG_USB_EHCI_HCD_MODULE)
        /* Setup Pin IO MUX for EHCI */
        if (cpu_is_omap34xx())
                setup_ehci_io_mux();
@@ -160,6 +155,6 @@ void __init usb_ehci_init(void)
                printk(KERN_ERR "Unable to register HS-USB (EHCI) device\n");
                return;
        }
-#endif
 }
 
+