diff mbox

OMAP3: EHCI: Allow EHCI to work as a module again

Message ID 5A47E75E594F054BAF48C5E4FC4B92AB0305C10FA4@dbde02.ent.ti.com (mailing list archive)
State Accepted
Commit 4baadee6e2dd5228e1b17cb5f931c4e0ed8fcb96
Headers show

Commit Message

Anand Gadiyar July 6, 2009, 7:05 a.m. UTC 
From: Anand Gadiyar <gadiyar@ti.com>

OMAP3: EHCI: Allow EHCI to work as a module again

commit fc3c45ca seems to have broken EHCI as a module. Fix this.

Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
---
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Felipe Balbi July 6, 2009, 7:13 a.m. UTC | #1 
On Mon, Jul 06, 2009 at 09:05:09AM +0200, ext Gadiyar, Anand wrote:
> From: Anand Gadiyar <gadiyar@ti.com>
> 
> OMAP3: EHCI: Allow EHCI to work as a module again
> 
> commit fc3c45ca seems to have broken EHCI as a module. Fix this.
> 
> Signed-off-by: Anand Gadiyar <gadiyar@ti.com>

hmm... that was a bad mistake :-s

Acked-by: Felipe Balbi <felipe.balbi@nokia.com>

> ---
> diff --git a/arch/arm/mach-omap2/usb-ehci.c b/arch/arm/mach-omap2/usb-ehci.c
> index 0fe26f2..56fc7f4 100644
> --- a/arch/arm/mach-omap2/usb-ehci.c
> +++ b/arch/arm/mach-omap2/usb-ehci.c
> @@ -27,7 +27,7 @@
>  #include <mach/irqs.h>
>  #include <mach/usb.h>
>  
> -#if defined(CONFIG_USB_EHCI_HCD) || #define(CONFIG_USB_EHCI_HCD_MODULE)
> +#if defined(CONFIG_USB_EHCI_HCD) || defined(CONFIG_USB_EHCI_HCD_MODULE)
>  
>  static struct resource ehci_resources[] = {
>  	{
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tony Lindgren Aug. 5, 2009, 1:23 p.m. UTC | #2 
This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Branch in linux-omap: master

Initial commit ID (Likely to change): 4baadee6e2dd5228e1b17cb5f931c4e0ed8fcb96

PatchWorks
http://patchwork.kernel.org/patch/34200/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=4baadee6e2dd5228e1b17cb5f931c4e0ed8fcb96


--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/mach-omap2/usb-ehci.c b/arch/arm/mach-omap2/usb-ehci.c
index 0fe26f2..56fc7f4 100644
--- a/arch/arm/mach-omap2/usb-ehci.c
+++ b/arch/arm/mach-omap2/usb-ehci.c
@@ -27,7 +27,7 @@ 
 #include <mach/irqs.h>
 #include <mach/usb.h>
 
-#if defined(CONFIG_USB_EHCI_HCD) || #define(CONFIG_USB_EHCI_HCD_MODULE)
+#if defined(CONFIG_USB_EHCI_HCD) || defined(CONFIG_USB_EHCI_HCD_MODULE)
 
 static struct resource ehci_resources[] = {
 	{