Merge branches 'x86/acpi', 'x86/asm', 'x86/cpudetect', 'x86/crashdump', 'x86/debug...

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / usb.c

diff --git a/arch/arm/plat-omap/usb.c b/arch/arm/plat-omap/usb.c
index add0485703b50941c80f004d522cb80263ba5f41..e278de6862aec86bf07c3ddc4280c73681e355df 100644 (file)
--- a/arch/arm/plat-omap/usb.c
+++ b/arch/arm/plat-omap/usb.c
@@ -431,15 +431,6 @@ bad:
 
 /*-------------------------------------------------------------------------*/
 
-#if    defined(CONFIG_USB_GADGET_OMAP) || \
-       defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) || \
-       (defined(CONFIG_USB_OTG) && defined(CONFIG_ARCH_OMAP_OTG))
-static void usb_release(struct device *dev)
-{
-       /* normally not freed */
-}
-#endif
-
 #ifdef CONFIG_USB_GADGET_OMAP
 
 static struct resource udc_resources[] = {
@@ -466,7 +457,6 @@ static struct platform_device udc_device = {
        .name           = "omap_udc",
        .id             = -1,
        .dev = {
-               .release                = usb_release,
                .dma_mask               = &udc_dmamask,
                .coherent_dma_mask      = 0xffffffff,
        },
@@ -497,7 +487,6 @@ static struct platform_device ohci_device = {
        .name                   = "ohci",
        .id                     = -1,
        .dev = {
-               .release                = usb_release,
                .dma_mask               = &ohci_dmamask,
                .coherent_dma_mask      = 0xffffffff,
        },
@@ -524,9 +513,6 @@ static struct resource otg_resources[] = {
 static struct platform_device otg_device = {
        .name           = "omap_otg",
        .id             = -1,
-       .dev = {
-               .release                = usb_release,
-       },
        .num_resources  = ARRAY_SIZE(otg_resources),
        .resource       = otg_resources,
 };