From patchwork Wed Jan 29 12:23:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 23835 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f72.google.com (mail-pa0-f72.google.com [209.85.220.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1C2B1202FA for ; Wed, 29 Jan 2014 12:23:21 +0000 (UTC) Received: by mail-pa0-f72.google.com with SMTP id rd3sf3911228pab.7 for ; Wed, 29 Jan 2014 04:23:20 -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=ny3VHY0dr+bXZJbqZKY5JjdNU1PjXwRuzjAkSkDs9TQ=; b=cAXz9cC2z10lplogdtprYcF+2Zt0SV5tHrakZecAkv4h28+aXfj7mN5WJKLxqtlSuB 8JmFcoMmw7TVlapz0fZkqNA1qspQsXyrEKTex08uNrDqG2oWVHJOCMXPk+2+gJYYTXM/ iKRvHDKQ0F3zX2L0EuroXknTQXOb+8J111Km8RNjcYCup8VVpOBdTEO6dGl4cQmVfysk CRdlRpjZGc5zvzZm3M/9CETMx/UJCBotytAofvw+sAIfYS/luDkyuEzc1KfCtdF4Nbuh KXmarzClroVE2aFsQ9Kc8zpCikADW7PWCmdyY0pyb19RViFhNcr7uzU5BvxcAsVza+IG m+Xg== X-Gm-Message-State: ALoCoQlmx1Wi7Hpgner3JAINsNZ9GP0urJY3vheD7XQTJDyte1Jv9slk8+jhxunv7wUDxZhr9ExM X-Received: by 10.67.21.145 with SMTP id hk17mr2687043pad.35.1390998200367; Wed, 29 Jan 2014 04:23:20 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.84.71 with SMTP id k65ls94523qgd.89.gmail; Wed, 29 Jan 2014 04:23:20 -0800 (PST) X-Received: by 10.58.227.38 with SMTP id rx6mr6660716vec.10.1390998200222; Wed, 29 Jan 2014 04:23:20 -0800 (PST) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id vc3si727099vdc.135.2014.01.29.04.23.19 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 29 Jan 2014 04:23:19 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.171 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.171; Received: by mail-vc0-f171.google.com with SMTP id le5so1064680vcb.2 for ; Wed, 29 Jan 2014 04:23:19 -0800 (PST) X-Received: by 10.58.37.67 with SMTP id w3mr2047963vej.22.1390998199922; Wed, 29 Jan 2014 04:23:19 -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 u4csp108441vcz; Wed, 29 Jan 2014 04:23:19 -0800 (PST) X-Received: by 10.180.77.129 with SMTP id s1mr5503570wiw.56.1390998199000; Wed, 29 Jan 2014 04:23:19 -0800 (PST) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by mx.google.com with ESMTPS id q2si1334687wiv.59.2014.01.29.04.23.18 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 29 Jan 2014 04:23:18 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=74.125.82.50; Received: by mail-wg0-f50.google.com with SMTP id l18so3280257wgh.17 for ; Wed, 29 Jan 2014 04:23:18 -0800 (PST) X-Received: by 10.180.189.10 with SMTP id ge10mr19120939wic.47.1390998198500; Wed, 29 Jan 2014 04:23:18 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id y13sm4542827wjr.8.2014.01.29.04.23.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Jan 2014 04:23:17 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Cc: Linus Walleij , stable@vger.kernel.org, Andrea Adami , Dmitry Eremin-Solenikov Subject: [PATCH] ARM: sa1100: fix compile problem on Collie Date: Wed, 29 Jan 2014 13:23:14 +0100 Message-Id: <1390998194-9197-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.5.3 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.171 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: , Due to a problem in the MFD Kconfig it was not possible to compile the UCB battery driver for the Collie SA1100 system, in turn making it impossible to compile in the battery driver. (See patch "mfd: include all drivers in subsystem menu".) After fixing the MFD Kconfig (separate patch) a compile error appears in the Collie battery driver due to the implicitly requiring through via prior to commit 40ca061b "ARM: 7841/1: sa1100: remove complex GPIO interface". Fix this up by including the required header into . Cc: stable@vger.kernel.org Cc: Andrea Adami Cc: Dmitry Eremin-Solenikov Signed-off-by: Linus Walleij --- arch/arm/mach-sa1100/include/mach/collie.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/mach-sa1100/include/mach/collie.h b/arch/arm/mach-sa1100/include/mach/collie.h index f33679d2d3ee..50e1d850ee2e 100644 --- a/arch/arm/mach-sa1100/include/mach/collie.h +++ b/arch/arm/mach-sa1100/include/mach/collie.h @@ -13,6 +13,8 @@ #ifndef __ASM_ARCH_COLLIE_H #define __ASM_ARCH_COLLIE_H +#include "hardware.h" /* Gives GPIO_MAX */ + extern void locomolcd_power(int on); #define COLLIE_SCOOP_GPIO_BASE (GPIO_MAX + 1)