From patchwork Tue Jan 14 14:13:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 23186 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f72.google.com (mail-pb0-f72.google.com [209.85.160.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6281A2066C for ; Tue, 14 Jan 2014 14:13:19 +0000 (UTC) Received: by mail-pb0-f72.google.com with SMTP id jt11sf21004406pbb.3 for ; Tue, 14 Jan 2014 06:13:18 -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=aIHij9ObJZ1toQ5joFpO/QzmSSE1KYMLMsI2Id/DP9I=; b=AsmzWIO6/DW4lRH21pUJIfrY954EtfpMllWfhCu+zlQRTTUWrMc+VGbr7p0FBXmSlO OhsHkbBrj2qHP2p/Uu1qorWHN0Ku0IpNylali6eR9/VxWvwqKvJcocPgLBsFm6ugQ1K4 hlY84OCME9oCEjapWKsOTtXXAQUx3iPG0gWmU2D+Bfcsh0MnKWtb17iXgt7TJt85cLT3 1wumRxytaYbefUeIODKhV0ZlBBuQPHhWvJt5f+oo4MydUUdcIbb9aWk85OJC+t5VWwvg Kb4R1/Rha/fUKRSxfpt7DskyX1Kablg6IoOF7W9RX37NTLnYcZHALkl2DJldz0J/mGvw lreg== X-Gm-Message-State: ALoCoQlEcjs9XVFanl1b9SIi1HlFVkgzlNuPEFnpMWv/2tt7sPsoTbl0ecjbV99YTPsm/Uw8RPkP X-Received: by 10.66.191.138 with SMTP id gy10mr689309pac.30.1389708798670; Tue, 14 Jan 2014 06:13:18 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.4.105 with SMTP id j9ls156207qej.94.gmail; Tue, 14 Jan 2014 06:13:18 -0800 (PST) X-Received: by 10.58.211.130 with SMTP id nc2mr20629845vec.7.1389708798544; Tue, 14 Jan 2014 06:13:18 -0800 (PST) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id k10si288081vca.49.2014.01.14.06.13.18 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 14 Jan 2014 06:13:18 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.174 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.174; Received: by mail-vc0-f174.google.com with SMTP id im17so279852vcb.19 for ; Tue, 14 Jan 2014 06:13:18 -0800 (PST) X-Received: by 10.58.243.37 with SMTP id wv5mr756446vec.41.1389708798089; Tue, 14 Jan 2014 06:13:18 -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.59.13.131 with SMTP id ey3csp203880ved; Tue, 14 Jan 2014 06:13:17 -0800 (PST) X-Received: by 10.180.187.36 with SMTP id fp4mr20812569wic.9.1389708797105; Tue, 14 Jan 2014 06:13:17 -0800 (PST) Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by mx.google.com with ESMTPS id d7si10283108wiy.3.2014.01.14.06.13.16 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 14 Jan 2014 06:13:17 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.169 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=209.85.212.169; Received: by mail-wi0-f169.google.com with SMTP id e4so2560673wiv.4 for ; Tue, 14 Jan 2014 06:13:16 -0800 (PST) X-Received: by 10.194.1.238 with SMTP id 14mr14321992wjp.20.1389708796578; Tue, 14 Jan 2014 06:13:16 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id 5sm625729wjw.17.2014.01.14.06.13.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Jan 2014 06:13:15 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, Kukjin Kim , Ben Dooks , Arnd Bergmann Cc: Linus Walleij , Tomasz Figa , Sylwester Nawrocki , Heiko Stuebner , Mark Brown Subject: [PATCH] ARM: s3c24xx: explicit dependency on Date: Tue, 14 Jan 2014 15:13:08 +0100 Message-Id: <1389708788-18331-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.4.2 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.174 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: , Previously the custom GPIO header for the S3C24xx would in turn bring in the custom pin control implementation from . This is not good as it mixes up two subsystems and makes the dependencies hard to track. Make the dependency explicit by explicitly including the pin control header where needed. Reported-by: Arnd Bergmann Cc: Tomasz Figa Cc: Sylwester Nawrocki Cc: Ben Dooks Cc: Kukjin Kim Cc: Heiko Stuebner Cc: Mark Brown Cc: linux-samsung-soc@vger.kernel.org Signed-off-by: Linus Walleij --- Maintainers: this builds on top of the previous patch moving headers back to . This will also boil in linux-next, ACKs appreciated. --- arch/arm/mach-s3c24xx/h1940-bluetooth.c | 1 + arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h | 2 -- arch/arm/mach-s3c24xx/mach-rx1950.c | 1 + arch/arm/mach-s3c24xx/pm-s3c2410.c | 1 + arch/arm/mach-s3c24xx/setup-ts.c | 1 + drivers/mmc/host/s3cmci.c | 1 + 6 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-s3c24xx/h1940-bluetooth.c b/arch/arm/mach-s3c24xx/h1940-bluetooth.c index ff3afc163178..b4d14b864367 100644 --- a/arch/arm/mach-s3c24xx/h1940-bluetooth.c +++ b/arch/arm/mach-s3c24xx/h1940-bluetooth.c @@ -19,6 +19,7 @@ #include #include +#include #include #include #include diff --git a/arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h b/arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h index 79b3a0e44955..528fcdc4f63e 100644 --- a/arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h +++ b/arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h @@ -93,8 +93,6 @@ enum s3c_gpio_number { #define S3C2410_GPL(_nr) (S3C2410_GPIO_L_START + (_nr)) #define S3C2410_GPM(_nr) (S3C2410_GPIO_M_START + (_nr)) -#include - #ifdef CONFIG_CPU_S3C244X #define S3C_GPIO_END (S3C2410_GPJ(0) + 32) #elif defined(CONFIG_CPU_S3C2443) || defined(CONFIG_CPU_S3C2416) diff --git a/arch/arm/mach-s3c24xx/mach-rx1950.c b/arch/arm/mach-s3c24xx/mach-rx1950.c index 345d01aa3524..0a5456cda1bc 100644 --- a/arch/arm/mach-s3c24xx/mach-rx1950.c +++ b/arch/arm/mach-s3c24xx/mach-rx1950.c @@ -59,6 +59,7 @@ #include #include #include +#include #include "common.h" #include "h1940.h" diff --git a/arch/arm/mach-s3c24xx/pm-s3c2410.c b/arch/arm/mach-s3c24xx/pm-s3c2410.c index 509b20b4ab3b..20e481d8a33a 100644 --- a/arch/arm/mach-s3c24xx/pm-s3c2410.c +++ b/arch/arm/mach-s3c24xx/pm-s3c2410.c @@ -35,6 +35,7 @@ #include #include +#include #include #include diff --git a/arch/arm/mach-s3c24xx/setup-ts.c b/arch/arm/mach-s3c24xx/setup-ts.c index f61f02bdc52f..46466d20257e 100644 --- a/arch/arm/mach-s3c24xx/setup-ts.c +++ b/arch/arm/mach-s3c24xx/setup-ts.c @@ -15,6 +15,7 @@ struct platform_device; /* don't need the contents */ +#include #include #include diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c index e34d499cb316..f23782683a7c 100644 --- a/drivers/mmc/host/s3cmci.c +++ b/drivers/mmc/host/s3cmci.c @@ -23,6 +23,7 @@ #include #include +#include #include #include