From patchwork Wed Jan 2 22:23:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Kukjin X-Patchwork-Id: 1925541 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 75E723FE37 for ; Wed, 2 Jan 2013 22:42:07 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TqWwi-0000N4-1P; Wed, 02 Jan 2013 22:38:03 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TqWkW-0000qy-5Y for linux-arm-kernel@lists.infradead.org; Wed, 02 Jan 2013 22:25:26 +0000 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MG000B7VRKLFV10@mailout2.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 03 Jan 2013 07:25:02 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.51]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 86.60.01231.DB3B4E05; Thu, 03 Jan 2013 07:25:02 +0900 (KST) X-AuditID: cbfee61a-b7fa66d0000004cf-2f-50e4b3bd1e13 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 26.60.01231.DB3B4E05; Thu, 03 Jan 2013 07:25:01 +0900 (KST) Received: from localhost.localdomain ([105.128.18.183]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MG00028PRKVD920@mmp2.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 03 Jan 2013 07:25:01 +0900 (KST) From: Kukjin Kim To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 22/26] ARM: S3C64XX: make regs-gpio-memport.h local Date: Wed, 02 Jan 2013 14:23:59 -0800 Message-id: <1357165443-3716-23-git-send-email-kgene.kim@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-reply-to: <1357165443-3716-1-git-send-email-kgene.kim@samsung.com> References: <1357165443-3716-1-git-send-email-kgene.kim@samsung.com> DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrNLMWRmVeSWpSXmKPExsVy+t8zY919m58EGGx/y2Kx6fE1VgdGj81L 6gMYo7hsUlJzMstSi/TtErgyrm87xlJwUbSiYfIPpgbGFUJdjJwcEgImEpt6XrNB2GISF+6t B7K5OIQEljFKzP3whQmmqHvqCkaIxHRGiUV//0E5G5gkFr4+zAJSxSagIXH4/TP2LkYODhEB b4nl1xRBwswCURJnb79jBrGFBZwlbk2ewwhiswioSsx7O58VxOYVcJU4P/M/1DJFie5nE8Au 4gSK9228AmYLCbhIzD/zkhmiV0Di2+RDLCCrJARkJTYdYAY5R0LgOpvEs3XHoL6RlDi44gbL BEbhBYwMqxhFUwuSC4qT0nMN9YoTc4tL89L1kvNzNzFCQlBqB+PKBotDjAIcjEo8vIz1TwKE WBPLiitzDzFKcDArifBezwEK8aYkVlalFuXHF5XmpBYfYvQBumQis5Rocj4wPvJK4g2NjU3M TExNzC1NzU1xCCuJ8zZ7pAQICaQnlqRmp6YWpBbBjGPi4JRqYNyl9z1EvuanwteNoqfSOGXu RWtum77T/8hLJukJFnPu3z14YbrAstv79aQePZuqc++C+beEjVLfI9OXna6fmHrr+rqWEwr7 M/+LPbv7kC+jbrp3xz7pKap7Xz2Yt/VyrxpjzYmeiXIMewoMesJW9y8KtWHzfF2fHRfFEX9N TGuJUY7ZIcmwQyeVWIozEg21mIuKEwFWBv3RbgIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupikeLIzCtJLcpLzFFi42I5/e+xoO7ezU8CDH6tM7TY9PgaqwOjx+Yl 9QGMUQ2MNhmpiSmpRQqpecn5KZl56bZK3sHxzvGmZgaGuoaWFuZKCnmJuam2Si4+AbpumTlA U5UUyhJzSoFCAYnFxUr6dpgmhIa46VrANEbo+oYEwfUYGaCBhHWMGde3HWMpuCha0TD5B1MD 4wqhLkZODgkBE4nuqSsYIWwxiQv31rN1MXJxCAlMZ5RY9PcfI4SzgUli4evDLCBVbAIaEoff P2PvYuTgEBHwllh+TREkzCwQJXH29jtmEFtYwFni1uQ5YENZBFQl5r2dzwpi8wq4Spyf+Z8J YpmiRPezCWwgNidQvG/jFTBbSMBFYv6Zl8wTGHkXMDKsYhRNLUguKE5KzzXUK07MLS7NS9dL zs/dxAgO8GdSOxhXNlgcYhTgYFTi4WWsfxIgxJpYVlyZe4hRgoNZSYT3eg5QiDclsbIqtSg/ vqg0J7X4EKMP0FUTmaVEk/OB0ZdXEm9obGJmZGlkZmFkYm6OQ1hJnLfZIyVASCA9sSQ1OzW1 ILUIZhwTB6dUAyPjsulHWDcvXVmUZvU1ZPbscAnZ9K+pbYd9evknWm1VvnRvbfkVmQ+VW5dJ MU5/xK+lzdva8+jy9OIP1zkZTjNEPHRh2H2Jq6V88nQfo9PRC2bcfd51KV2mPe6f+uezZ79+ vGA6o09ur/uW/mMRbw7urlqvsb/qoqZWoVVP8SOJawLBKmVrldcpsRRnJBpqMRcVJwIAwemt eJ0CAAA= X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130102_172524_796074_DF5F1CE0 X-CRM114-Status: GOOD ( 11.96 ) X-Spam-Score: -7.6 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.25 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Kukjin Kim , Mark Brown X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The header can be local in mach-s3c64xx/. Cc: Mark Brown Signed-off-by: Kukjin Kim --- arch/arm/mach-s3c64xx/mach-crag6410.c | 3 +-- arch/arm/mach-s3c64xx/pm.c | 3 ++- arch/arm/mach-s3c64xx/{include/mach => }/regs-gpio-memport.h | 9 ++++----- 3 files changed, 7 insertions(+), 8 deletions(-) rename arch/arm/mach-s3c64xx/{include/mach => }/regs-gpio-memport.h (71%) diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c index d559969..e1a0742 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c @@ -54,8 +54,6 @@ #include #include -#include - #include #include #include @@ -72,6 +70,7 @@ #include "common.h" #include "crag6410.h" +#include "regs-gpio-memport.h" /* serial port setup */ diff --git a/arch/arm/mach-s3c64xx/pm.c b/arch/arm/mach-s3c64xx/pm.c index 7feb426..f431987 100644 --- a/arch/arm/mach-s3c64xx/pm.c +++ b/arch/arm/mach-s3c64xx/pm.c @@ -30,9 +30,10 @@ #include #include #include -#include #include +#include "regs-gpio-memport.h" + struct s3c64xx_pm_domain { char *const name; u32 ena; diff --git a/arch/arm/mach-s3c64xx/include/mach/regs-gpio-memport.h b/arch/arm/mach-s3c64xx/regs-gpio-memport.h similarity index 71% rename from arch/arm/mach-s3c64xx/include/mach/regs-gpio-memport.h rename to arch/arm/mach-s3c64xx/regs-gpio-memport.h index 82342f6..b927593 100644 --- a/arch/arm/mach-s3c64xx/include/mach/regs-gpio-memport.h +++ b/arch/arm/mach-s3c64xx/regs-gpio-memport.h @@ -1,5 +1,4 @@ -/* linux/arch/arm/plat-s3c64xx/include/mach/regs-gpio-memport.h - * +/* * Copyright 2008 Openmoko, Inc. * Copyright 2008 Simtec Electronics * Ben Dooks @@ -8,8 +7,8 @@ * S3C64XX - GPIO memory port register definitions */ -#ifndef __ASM_PLAT_S3C64XX_REGS_GPIO_MEMPORT_H -#define __ASM_PLAT_S3C64XX_REGS_GPIO_MEMPORT_H __FILE__ +#ifndef __MACH_S3C64XX_REGS_GPIO_MEMPORT_H +#define __MACH_S3C64XX_REGS_GPIO_MEMPORT_H __FILE__ #define S3C64XX_MEM0CONSTOP S3C64XX_GPIOREG(0x1B0) #define S3C64XX_MEM1CONSTOP S3C64XX_GPIOREG(0x1B4) @@ -21,5 +20,5 @@ #define S3C64XX_MEM0DRVCON S3C64XX_GPIOREG(0x1D0) #define S3C64XX_MEM1DRVCON S3C64XX_GPIOREG(0x1D4) -#endif /* __ASM_PLAT_S3C64XX_REGS_GPIO_MEMPORT_H */ +#endif /* __MACH_S3C64XX_REGS_GPIO_MEMPORT_H */