| Message ID | 1384771040-30906-1-git-send-email-linus.walleij@linaro.org |
|---|---|
| State | Accepted |
| Commit | b144e4ab1ef130e8bf30bcd3e529b7f35112c503 |
| Headers | show
Return-Path: <patchwork-forward+bncBDE6RCFOWIARB2W3U6KAKGQE6LWL7TQ@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f200.google.com (mail-qc0-f200.google.com [209.85.216.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A354423FF2 for <linaro@patches.linaro.org>; Mon, 18 Nov 2013 10:37:31 +0000 (UTC) Received: by mail-qc0-f200.google.com with SMTP id r7sf11669288qcx.11 for <linaro@patches.linaro.org>; Mon, 18 Nov 2013 02:37:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=d47ZAAwTgZNWgu8PwRM0pbT7AXyy7gwFOSpbYueUm+o=; b=lO7JlzSeVcFATod8RsRFxKb0UU2RD4WFG7rtM9gttdlYpDOUahJuxCW9fYW5Yb7xVF /j7V0OyU/oUjoTg/dPjSM3+v0SmfQ4WujzCtZ8M0tyRgMfOlQwzZe2oy+zxHYD5gezSy /K5VDUw118vuv406wf5W3pWcOWU5niHdiQqqB/gopIg8QasrfSyix61h2NNDoKo5BAaO FNMSSPUfLXhK4b+Za0aggwclR1uqHy2Vj+LIERfBD0ePPhCUAfwl8PymaFcXg8uS/2q8 wwz02lysdCsaNKqsS1Hu56+D6/y0aWgozyj+VPqxUU6b3Q0ux38jH2iR4VGALv4TPNmS OdDQ== X-Gm-Message-State: ALoCoQn6PMenzxMbVNPHxdwIZ3WOgW9Pb/bhTmzBOME3uW39mu0tqJi7/xiRsBostArdvl7r0cUB X-Received: by 10.58.187.197 with SMTP id fu5mr8126756vec.34.1384771050281; Mon, 18 Nov 2013 02:37:30 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.128.138 with SMTP id no10ls2556322qeb.18.gmail; Mon, 18 Nov 2013 02:37:30 -0800 (PST) X-Received: by 10.58.108.196 with SMTP id hm4mr95769veb.28.1384771050144; Mon, 18 Nov 2013 02:37:30 -0800 (PST) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id cp3si7034610vcb.58.2013.11.18.02.37.30 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 18 Nov 2013 02:37:30 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id ht10so814260vcb.15 for <patchwork-forward@linaro.org>; Mon, 18 Nov 2013 02:37:30 -0800 (PST) X-Received: by 10.52.97.35 with SMTP id dx3mr12940225vdb.18.1384771050044; Mon, 18 Nov 2013 02:37:30 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp192431vcz; Mon, 18 Nov 2013 02:37:29 -0800 (PST) X-Received: by 10.180.89.98 with SMTP id bn2mr16330354wib.63.1384771049054; Mon, 18 Nov 2013 02:37:29 -0800 (PST) Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) by mx.google.com with ESMTPS id u5si251641wjw.66.2013.11.18.02.37.28 for <patches@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 18 Nov 2013 02:37:29 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.175 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=209.85.212.175; Received: by mail-wi0-f175.google.com with SMTP id hm11so3584551wib.8 for <patches@linaro.org>; Mon, 18 Nov 2013 02:37:28 -0800 (PST) X-Received: by 10.180.198.170 with SMTP id jd10mr1447528wic.65.1384771048521; Mon, 18 Nov 2013 02:37:28 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id qc10sm22787763wic.9.2013.11.18.02.37.26 for <multiple recipients> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Nov 2013 02:37:27 -0800 (PST) From: Linus Walleij <linus.walleij@linaro.org> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Felipe Balbi <balbi@ti.com> Cc: linux-usb@vger.kernel.org, Russell King <linux@arm.linux.org.uk>, Linus Walleij <linus.walleij@linaro.org> Subject: [PATCH] usb: gadget: fix pxa25x compilation problems Date: Mon, 18 Nov 2013 11:37:20 +0100 Message-Id: <1384771040-30906-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.3.1 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: <patchwork-forward.linaro.org> X-Google-Group-Id: 836684582541 List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe>, <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com> |
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c index 0ac6064aa3b8..409a3c45a36a 100644 --- a/drivers/usb/gadget/pxa25x_udc.c +++ b/drivers/usb/gadget/pxa25x_udc.c @@ -54,6 +54,7 @@ */ #ifdef CONFIG_ARCH_PXA #include <mach/pxa25x-udc.h> +#include <mach/hardware.h> #endif #ifdef CONFIG_ARCH_LUBBOCK
In commit 88f718e3fa4d67f3a8dbe79a2f97d722323e4051 "ARM: pxa: delete the custom GPIO header" we removed the implicit inclusion of <mach/gpio.h> from <linux/gpio.h>. The pxa25x_udc was not using that, but it was relying on <linux/gpio.h> to implictly include <mach/gpio.h> which in turn implicitly included <mach/hardware.h>, which was needed for the driver to compile. Fix this up by explicitly including the necessary <mach/hardware.h> header. Reported-by: Russell King <linux@arm.linux.org.uk> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- drivers/usb/gadget/pxa25x_udc.c | 1 + 1 file changed, 1 insertion(+)