From patchwork Sun Dec  6 03:15:57 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Sid Boyce <sboyce@blueyonder.co.uk>
X-Patchwork-Id: 65093
X-Patchwork-Delegate: tony@atomide.com
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nB63G4ww032054
	for <patchwork-omap@patchwork.kernel.org>;
	Sun, 6 Dec 2009 03:16:05 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1758033AbZLFDP5 (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Sat, 5 Dec 2009 22:15:57 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758027AbZLFDP5
	(ORCPT <rfc822; linux-omap-outgoing>);
	Sat, 5 Dec 2009 22:15:57 -0500
Received: from smtp-out2.blueyonder.co.uk ([195.188.213.5]:44775 "EHLO
	smtp-out2.blueyonder.co.uk" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1756123AbZLFDPz (ORCPT
	<rfc822; linux-omap@vger.kernel.org>); Sat, 5 Dec 2009 22:15:55 -0500
Received: from [172.23.170.145] (helo=anti-virus03-08)
	by smtp-out2.blueyonder.co.uk with smtp (Exim 4.52)
	id 1NH7bM-0004i9-H8; Sun, 06 Dec 2009 03:16:00 +0000
Received: from [94.171.130.58] (helo=[192.168.10.2])
	by asmtp-out5.blueyonder.co.uk with esmtpa (Exim 4.52)
	id 1NH7bK-00034p-O0; Sun, 06 Dec 2009 03:15:59 +0000
Message-ID: <4B1B21ED.30003@blueyonder.co.uk>
Date: Sun, 06 Dec 2009 03:15:57 +0000
From: Sid Boyce <sboyce@blueyonder.co.uk>
Reply-To: sboyce@blueyonder.co.uk
Organization: blueyonder.co.uk
User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US;
	rv:1.9.1.4pre) Gecko/20090915 SUSE/3.0b4-5.9 Thunderbird/3.0b4
	ThunderBrowse/3.2.6.5
MIME-Version: 1.0
To: Tony Lindgren <tony@atomide.com>
CC: linux-omap@vger.kernel.org
Subject: Re: What's in omap git tree for 2.6.33
References: <20091204182604.GC24013@atomide.com>
In-Reply-To: <20091204182604.GC24013@atomide.com>
Sender: linux-omap-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-omap.vger.kernel.org>
X-Mailing-List: linux-omap@vger.kernel.org


diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 034d990..a913b05 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -18,6 +18,7 @@ config ARCH_OMAP2430
 config ARCH_OMAP34XX
        bool "OMAP34xx Based System"
        depends on ARCH_OMAP3
+       select USB_ARCH_HAS_EHCI

 config ARCH_OMAP3430
        bool "OMAP3430 support"

drivers/usb/host/ehci-omap.c
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -37,7 +37,7 @@
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 #include <linux/gpio.h>
-#include <mach/usb.h>
+#include <plat/usb.h>

 /*
  * OMAP USBHOST Register addresses: VIRTUAL ADDRESSES