Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 130242
b: refs/heads/master
c: 0b23a0e
h: refs/heads/master
v: v3
  • Loading branch information
Russell King authored and Russell King committed Jan 24, 2009
1 parent 1123b41 commit 66b32b5
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 15 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b7cfc9ca6a511acec529cad322eec2a6379f35f7
refs/heads/master: 0b23a0efec9ab691a5bb902f9255892c8ddfd434
14 changes: 0 additions & 14 deletions trunk/arch/arm/plat-omap/usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -431,15 +431,6 @@ static u32 __init omap_usb2_init(unsigned nwires, unsigned alt_pingroup)

/*-------------------------------------------------------------------------*/

#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[] = {
Expand All @@ -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,
},
Expand Down Expand Up @@ -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,
},
Expand All @@ -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,
};
Expand Down

0 comments on commit 66b32b5

Please sign in to comment.