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: 3485841 Return-Path: X-Original-To: patchwork-linux-samsung-soc@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 BD255C02DC for ; Tue, 14 Jan 2014 14:13:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1486A2021B for ; Tue, 14 Jan 2014 14:13:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4903C201F4 for ; Tue, 14 Jan 2014 14:13:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751430AbaANONS (ORCPT ); Tue, 14 Jan 2014 09:13:18 -0500 Received: from mail-wg0-f48.google.com ([74.125.82.48]:64841 "EHLO mail-wg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751318AbaANONR (ORCPT ); Tue, 14 Jan 2014 09:13:17 -0500 Received: by mail-wg0-f48.google.com with SMTP id x13so424753wgg.15 for ; Tue, 14 Jan 2014 06:13:16 -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=aIHij9ObJZ1toQ5joFpO/QzmSSE1KYMLMsI2Id/DP9I=; b=DmrZRrz9VloGHPHGGbQ/YDA/eJS4pOKzFq48tBs4rq/bW+NRHGeb4jvMCOp4z7ehrT UcPzgCVWSdEJV9JIn1vaBBfCxWfsufVA1zfre40aTYL72+Axf2VjJl4/OJKUuXnv+vfT BxjbLCNoPL2GEOgcwq9K+Z8AnqtDdkEPvqHj8Ogzf4VzXCa4h61vZGP+vvQLERGpMf0I 4w4XpI9GJha4Zhwjxb6DwaFBoUlnYIfAXq5s6QYDZ76aUQW7r/TZ5W+AkEgsuIgx7SUL DkmiAIEppxXaSn4VL0ZqXQumYH6IrkjIZZG8PVDGEZRPhPabPRHr2KqRF43qvIBDDmEU RA3g== X-Gm-Message-State: ALoCoQlIoOJlMW8tLkShPUumbeObJdXy6NSCQLLZ7ptTcZ1GYSag7KMBzCHvXUYUdNvQ4AYQEf81 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 Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 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 Acked-by: Heiko Stuebner --- 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