diff mbox

usb: ehci-omap: Fix build break

Message ID 20090922151140.GB8975@lixom.net (mailing list archive)
State Superseded, archived
Headers show

Commit Message

Olof Johansson Sept. 22, 2009, 3:11 p.m. UTC
Fix build break:

  CC      drivers/usb/host/ehci-hcd.o
In file included from drivers/usb/host/ehci-hcd.c:1101:
drivers/usb/host/ehci-omap.c: In function 'omap_start_ehc':
drivers/usb/host/ehci-omap.c:238: error: 'CHIP_GE_OMAP3430ES3' undeclared (first use in this function)
drivers/usb/host/ehci-omap.c:238: error: (Each undeclared identifier is reported only once
drivers/usb/host/ehci-omap.c:238: error: for each function it appears in.)
make[3]: *** [drivers/usb/host/ehci-hcd.o] Error 1


No reference to CHIP_GE_OMAP3430ES3 anywhere else, I'm assuming it's
ES3_1 that's supposed to be used.


Signed-off-by: Olof Johansson <olof@lixom.net>

--
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

Tony Lindgren Sept. 22, 2009, 5:12 p.m. UTC | #1
* Olof Johansson <olof@lixom.net> [090922 07:55]:
> Fix build break:
> 
>   CC      drivers/usb/host/ehci-hcd.o
> In file included from drivers/usb/host/ehci-hcd.c:1101:
> drivers/usb/host/ehci-omap.c: In function 'omap_start_ehc':
> drivers/usb/host/ehci-omap.c:238: error: 'CHIP_GE_OMAP3430ES3' undeclared (first use in this function)
> drivers/usb/host/ehci-omap.c:238: error: (Each undeclared identifier is reported only once
> drivers/usb/host/ehci-omap.c:238: error: for each function it appears in.)
> make[3]: *** [drivers/usb/host/ehci-hcd.o] Error 1
> 
> 
> No reference to CHIP_GE_OMAP3430ES3 anywhere else, I'm assuming it's
> ES3_1 that's supposed to be used.

I'm dropping the "ehci: Support for ES3.x" patch instead for now
until it's fixed to use the omap_rev().

So this should not be needed.

Tony 
 
> Signed-off-by: Olof Johansson <olof@lixom.net>
> 
> diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
> index f77a99d..301e7b6 100644
> --- a/drivers/usb/host/ehci-omap.c
> +++ b/drivers/usb/host/ehci-omap.c
> @@ -235,7 +235,7 @@ static void omap_usb_utmi_init(struct ehci_hcd_omap *omap, u8 tll_channel_mask)
>   */
>  static int omap_start_ehc(struct ehci_hcd_omap *omap, struct usb_hcd *hcd)
>  {
> -	struct omap_chip_id oci = OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES3);
> +	struct omap_chip_id oci = OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES3_1);
>  	unsigned long timeout = jiffies + msecs_to_jiffies(1000);
>  	u8 tll_ch_mask = 0;
>  	unsigned reg = 0;
--
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/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index f77a99d..301e7b6 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -235,7 +235,7 @@  static void omap_usb_utmi_init(struct ehci_hcd_omap *omap, u8 tll_channel_mask)
  */
 static int omap_start_ehc(struct ehci_hcd_omap *omap, struct usb_hcd *hcd)
 {
-	struct omap_chip_id oci = OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES3);
+	struct omap_chip_id oci = OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES3_1);
 	unsigned long timeout = jiffies + msecs_to_jiffies(1000);
 	u8 tll_ch_mask = 0;
 	unsigned reg = 0;