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: 3323081 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DDDD0C0D4A for ; Wed, 11 Dec 2013 08:50:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C444F20714 for ; Wed, 11 Dec 2013 08:50:32 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4B12820702 for ; Wed, 11 Dec 2013 08:50:31 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VqfUV-0004Oa-NL; Wed, 11 Dec 2013 08:50:00 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VqfUJ-0003R6-7K; Wed, 11 Dec 2013 08:49:47 +0000 Received: from mail-la0-f41.google.com ([209.85.215.41]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VqfU1-0003Nm-0x for linux-arm-kernel@lists.infradead.org; Wed, 11 Dec 2013 08:49:30 +0000 Received: by mail-la0-f41.google.com with SMTP id eo20so3513104lab.14 for ; Wed, 11 Dec 2013 00:49:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=TPH/nCbUTx6s4laAf/AbrBkHZupKmHHWUYdry0J00T4=; b=l4S434AefWDAPbxgf7QjuL0XLJ9EC8yYF12onoGTfAQQRHsH5hZ77O6f5+Pvf5fLEG QJ4ZAKL+6VDDx202rIMnFGiq/nAiJEWiieOHE61sYecinioT4x3XCqxTmh5oLX4LMKLl imCAovmTdjjcxXBdqByIvw8JLGpuu20cq4NmNw2llV1163FJ5a24+ACl5MpjFkDJdXdl v0HwHTg5/ctfkn26WMfKsc0KThAYETPYZ6hQ5ksmfCGdoLeoTtqjD2pDKCPMSzXLELbX SvDbM/1NaYHn40tQ9zFGKJCr6GRp9DpoLKbqmDRGO5L819iCvGgdLy5+uFmC9pF6LZeE Olqg== X-Gm-Message-State: ALoCoQmZsK0IAlbnAc4OJl/7kP9zjFCKwNoTSb4R7cudiocywyJIbPawrG/M45QNOYb+Zbr5YBYT 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 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131211_034929_276417_F8389B37 X-CRM114-Status: GOOD ( 12.40 ) X-Spam-Score: -2.6 (--) Cc: Greg Kroah-Hartmann , Linus Walleij , Felipe Balbi X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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