From patchwork Thu Apr 11 21:37:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 235930 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C362A2C00C8 for ; Fri, 12 Apr 2013 07:37:55 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753130Ab3DKVhy (ORCPT ); Thu, 11 Apr 2013 17:37:54 -0400 Received: from moutng.kundenserver.de ([212.227.126.186]:56059 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753109Ab3DKVhx (ORCPT ); Thu, 11 Apr 2013 17:37:53 -0400 Received: from wuerfel.lan (HSI-KBW-095-208-002-043.hsi5.kabel-badenwuerttemberg.de [95.208.2.43]) by mrelayeu.kundenserver.de (node=mreu4) with ESMTP (Nemesis) id 0LZYWu-1UrzhP0veO-00lMFW; Thu, 11 Apr 2013 23:37:39 +0200 From: Arnd Bergmann To: Kukjin Kim Cc: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, Arnd Bergmann , linux-i2c@vger.kernel.org, Wolfram Sang , Ben Dooks Subject: [PATCH v3 05/10] i2c: s3c2410: make header file local Date: Thu, 11 Apr 2013 23:37:20 +0200 Message-Id: <1365716245-99231-6-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1365716245-99231-1-git-send-email-arnd@arndb.de> References: <1365716245-99231-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:TUtGFMAb1foNbkL0rItyUXg7zyD3sH0HE/XbISfznlJ yM7TlHFBCtL72DtwEwvh/HFmkUFBEa3t1XDVfbIvmUFObhv1c7 CoAu8QTk+q55B6gdSiziArs9GvUIrEEXY4YSe3CJkUwznDxnt3 Ndvn47PEXDH3Y3Ogsl5ZLupwKMO/XDnM570DKo2DJE3J4xovv/ FOpY5OyNEvPxTywchwOfwtouCp/z2CVVP+kWzs8cE8RhvV9Fes QxS4fxlT+55D7p4fsdQXxstlqMQf2dcyPV2lSB55rbS5q3CQ+r P5GdymXkgTrGzZDaAKLNT8sxPkIfUXGW+colRNO5bg4kiM/hlG S5tyNxiIYAqjESmtUeNCeeWyEBGOSWcZu5Lc+NjH9 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org No other file in the kernel besides i2c-s3c2410.c uses the current plat/regs-iic.h, so we can simply move the header file to live in the same directory as the driver, as a preparation to multiplatform builds. Signed-off-by: Arnd Bergmann Cc: linux-i2c@vger.kernel.org Cc: Wolfram Sang Cc: Ben Dooks --- arch/arm/mach-s3c24xx/mach-rx1950.c | 1 - arch/arm/plat-samsung/devs.c | 1 - drivers/i2c/busses/i2c-s3c2410.c | 3 ++- .../include/plat/regs-iic.h => drivers/i2c/busses/i2c-s3c2410.h | 0 4 files changed, 2 insertions(+), 3 deletions(-) rename arch/arm/plat-samsung/include/plat/regs-iic.h => drivers/i2c/busses/i2c-s3c2410.h (100%) diff --git a/arch/arm/plat-samsung/include/plat/regs-iic.h b/drivers/i2c/busses/i2c-s3c2410.h similarity index 100% rename from arch/arm/plat-samsung/include/plat/regs-iic.h rename to drivers/i2c/busses/i2c-s3c2410.h diff --git a/arch/arm/mach-s3c24xx/mach-rx1950.c b/arch/arm/mach-s3c24xx/mach-rx1950.c index 1f9ba2a..43f3ac5 100644 --- a/arch/arm/mach-s3c24xx/mach-rx1950.c +++ b/arch/arm/mach-s3c24xx/mach-rx1950.c @@ -56,7 +56,6 @@ #include #include #include -#include #include #include "common.h" diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index de9ad27..5e37051 100644 --- a/arch/arm/plat-samsung/devs.c +++ b/arch/arm/plat-samsung/devs.c @@ -62,7 +62,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index f6b880b..d042ad0 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c @@ -42,9 +42,10 @@ #include -#include #include +#include "i2c-s3c2410.h" + /* Treat S3C2410 as baseline hardware, anything else is supported via quirks */ #define QUIRK_S3C2440 (1 << 0) #define QUIRK_HDMIPHY (1 << 1)