From patchwork Wed Dec 11 08:48:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 22242 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f198.google.com (mail-pd0-f198.google.com [209.85.192.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8CDF020E7C for ; Wed, 11 Dec 2013 08:49:10 +0000 (UTC) Received: by mail-pd0-f198.google.com with SMTP id g10sf27651596pdj.1 for ; Wed, 11 Dec 2013 00:49:09 -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=TPH/nCbUTx6s4laAf/AbrBkHZupKmHHWUYdry0J00T4=; b=AZE4wfHIH2r+I+XGN1avsb/bi7xZ25hWS7bHYxEpA99K/HPb9hOKzCQDEQEnJHfoA6 D8Wwz30yEY4trCekYn1BFVTWt06fd7LyR4ju6P9QiE2G3eEawTutljihPkQTkiVZe4QY D4EuFdOhejpEiwJB030cHDm6NeireXN9lYGOod9E0Vfspahe0fKDDteSkHKn7Ahct87V JJ9ESgsZ95WB7R3Su+XMsgwEpqC171Pjz1xacOJ8/haslDm7+33uH2K0qxf/yOsBzhsH Lq2l5bJocwxiZ4l4hCh1BJAElEdi1ufQ9Td5V/R+TMyM7jTuBgz0/3E0ojoEU5EOPnaD rlJw== X-Gm-Message-State: ALoCoQmvXOxukyNZrx5jsI4wn1kl/3O/fwLKSwgO0obJGzIE7Lhb1rqAaUElrNUBDk1PigPs3brR X-Received: by 10.66.102.8 with SMTP id fk8mr182944pab.24.1386751749185; Wed, 11 Dec 2013 00:49:09 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.37.195 with SMTP id a3ls19238qek.88.gmail; Wed, 11 Dec 2013 00:49:09 -0800 (PST) X-Received: by 10.58.108.196 with SMTP id hm4mr94533veb.28.1386751749005; Wed, 11 Dec 2013 00:49:09 -0800 (PST) Received: from mail-vb0-f44.google.com (mail-vb0-f44.google.com [209.85.212.44]) by mx.google.com with ESMTPS id r16si6232882vcn.100.2013.12.11.00.49.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 11 Dec 2013 00:49:09 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.44 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.44; Received: by mail-vb0-f44.google.com with SMTP id x8so1420958vbf.3 for ; Wed, 11 Dec 2013 00:49:08 -0800 (PST) X-Received: by 10.221.39.195 with SMTP id tn3mr104568vcb.2.1386751748904; Wed, 11 Dec 2013 00:49:08 -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 u4csp254397vcz; Wed, 11 Dec 2013 00:49:08 -0800 (PST) X-Received: by 10.152.120.66 with SMTP id la2mr170219lab.62.1386751747652; Wed, 11 Dec 2013 00:49:07 -0800 (PST) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com [209.85.215.51]) by mx.google.com with ESMTPS id x7si6881822lag.111.2013.12.11.00.49.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 11 Dec 2013 00:49:07 -0800 (PST) Received-SPF: neutral (google.com: 209.85.215.51 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=209.85.215.51; Received: by mail-la0-f51.google.com with SMTP id ec20so3505792lab.38 for ; Wed, 11 Dec 2013 00:49:06 -0800 (PST) X-Received: by 10.152.87.13 with SMTP id t13mr162187laz.72.1386751746648; Wed, 11 Dec 2013 00:49:06 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id sd11sm27097816lab.2.2013.12.11.00.49.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Dec 2013 00:49:05 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Russell King , Eric Miao , Haojian Zhuang Cc: Linus Walleij , Greg Kroah-Hartmann , Felipe Balbi Subject: [PATCH] ARM: pxa: fix USB gadget driver compilation regression Date: Wed, 11 Dec 2013 09:48:58 +0100 Message-Id: <1386751738-13563-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.212.44 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: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , After commit 88f718e3fa4d67f3a8dbe79a2f97d722323e4051 "ARM: pxa: delete the custom GPIO header" a compilation error was introduced in the PXA25x gadget driver. An attempt to fix the problem was made in commit b144e4ab1ef130e8bf30bcd3e529b7f35112c503 "usb: gadget: fix pxa25x compilation problems" by explictly stating the driver needs the header, which solved the compilation for a few boards, such as the pxa255-idp and its defconfig. However the Lubbock board has this special clause in drivers/usb/gadget/pxa25x_udc.c: This include file has an implicit dependency on having been included before was included. Before commit 88f718e3fa4d67f3a8dbe79a2f97d722323e4051 "ARM: pxa: delete the custom GPIO header" this implicit dependency for the pxa25x_udc compile on the Lubbock was satisfied by implicitly including which was in turn including , apart from the earlier added . Fix this by having the PXA25x explicitly include . Reported-by: Russell King Cc: Greg Kroah-Hartmann Cc: Felipe Balbi Signed-off-by: Linus Walleij --- arch/arm/mach-pxa/include/mach/lubbock.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/mach-pxa/include/mach/lubbock.h b/arch/arm/mach-pxa/include/mach/lubbock.h index 2a086e8373eb..958cd6af9384 100644 --- a/arch/arm/mach-pxa/include/mach/lubbock.h +++ b/arch/arm/mach-pxa/include/mach/lubbock.h @@ -10,6 +10,8 @@ * published by the Free Software Foundation. */ +#include + #define LUBBOCK_ETH_PHYS PXA_CS3_PHYS #define LUBBOCK_FPGA_PHYS PXA_CS2_PHYS