From patchwork Tue Dec 17 11:52:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kgene@kernel.org X-Patchwork-Id: 3360811 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 52CE29F344 for ; Tue, 17 Dec 2013 11:52:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B041B2039E for ; Tue, 17 Dec 2013 11:52:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 513F520394 for ; Tue, 17 Dec 2013 11:52:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752340Ab3LQLwU (ORCPT ); Tue, 17 Dec 2013 06:52:20 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:10925 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751914Ab3LQLwT (ORCPT ); Tue, 17 Dec 2013 06:52:19 -0500 Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MXY00K4O8Z6G040@mailout3.samsung.com> for linux-samsung-soc@vger.kernel.org; Tue, 17 Dec 2013 20:52:18 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.48]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id 4B.36.06250.2FA30B25; Tue, 17 Dec 2013 20:52:18 +0900 (KST) X-AuditID: cbfee68e-b7fb46d00000186a-8d-52b03af24323 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id C0.8B.20899.2FA30B25; Tue, 17 Dec 2013 20:52:18 +0900 (KST) Received: from DOKGENEKIM03 ([12.23.120.199]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MXY00L0Q8Z6SN00@mmp2.samsung.com>; Tue, 17 Dec 2013 20:52:18 +0900 (KST) From: kgene@kernel.org To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 04/11] ARM: EXYNOS: cleanup Date: Tue, 17 Dec 2013 20:52:17 +0900 Message-id: <116201cefb1e$6f9f3ae0$4eddb0a0$@kernel.org> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailer: Microsoft Outlook 14.0 Thread-index: Ac77HmwF3ksHLluHQ5mrt9aMmhIz6w== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprPIsWRmVeSWpSXmKPExsVy+t8zA91PVhuCDH5fE7DY9Pgaq8WM8/uY HJg8Ni+p9/i8SS6AKYrLJiU1J7MstUjfLoErY2PbA6aCY2IV9w93sjYwPhPqYuTkkBAwkVjf uYIdwhaTuHBvPVsXIxeHkMAyRok5TctZYYo+PX7IDJGYziixYNZ2JgjnL6PExW0NjF2MHBxs QO1Tn0iDNAgLaEks3NLEAhIWEfCWWH5NESJsK3Hr2A02EJtFQFVi2elvbCAlvAIWEl+vBYGE eQUEJX5MvscCYjMDTVm/8zgThC0vsXnNW2aIcxQkdpx9zQhiiwjoSez92cIIUSMise/FO0aQ yyQEprNL3Jy9mRVil4DEt8mHwM6REJCV2HQAao6kxMEVN1gmMIrNQrJ6FpLVs5CsnoVkxQJG llWMoqkFyQXFSelFRnrFibnFpXnpesn5uZsYIZHTt4Px5gHrQ4zJQOsnMkuJJucDIy+vJN7Q 2MzIwtTE1NjI3NKMNGElcd5FD5OChATSE0tSs1NTC1KL4otKc1KLDzEycXBKNTC6zhR2q87/ rTAnOcTe/YbUnAr7z9vj8hX+OIonO1pWZkhcEGBbM0F+w7GAO8vPbHVQbU56u5RD7VNy/gzP nOWnC07/Xr5Knv/MC2t2N7sDYfqLjxd8+ZIu9t83+uDDZ1vfLZtpbr9HzGzSzry1agd9Ggo3 9OybvS274UIJi1WG/ofVDUElObFKLMUZiYZazEXFiQB+A2p/sgIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDIsWRmVeSWpSXmKPExsVy+t9jQd1PVhuCDJZd47HY9Pgaq8WM8/uY HJg8Ni+p9/i8SS6AKaqB0SYjNTEltUghNS85PyUzL91WyTs43jne1MzAUNfQ0sJcSSEvMTfV VsnFJ0DXLTMHaLySQlliTilQKCCxuFhJ3w7ThNAQN10LmMYIXd+QILgeIwM0kLCOMWNj2wOm gmNiFfcPd7I2MD4T6mLk5JAQMJH49PghM4QtJnHh3nq2LkYuDiGB6YwSC2ZtZ4Jw/jJKXNzW wNjFyMHBBlQ19Yk0SIOwgJbEwi1NLCBhEQFvieXXFCHCthK3jt1gA7FZBFQllp3+xgZSwitg IfH1WhBImFdAUOLH5HssIDYz0JT1O48zQdjyEpvXvIU6R0Fix9nXjCC2iICexN6fLYwQNSIS +168Y5zAKDALyahZSEbNQjJqFpKWBYwsqxhFUwuSC4qT0nON9IoTc4tL89L1kvNzNzGC4/KZ 9A7GVQ0WhxgFOBiVeHg5Zq8PEmJNLCuuzD3EKMHBrCTCe153Q5AQb0piZVVqUX58UWlOavEh xmSgRycyS4km5wNTRl5JvKGxiZmRpZGZhZGJuTlpwkrivAdbrQOFBNITS1KzU1MLUotgtjBx cEo1MJaYbJ/m7fUqLedH35m3qlsmul4se+m8MUNw3ttPc5jfPZNVFHsndKXX6eV3df0MiZAr H1TcbzmpJf0PDMoo+Ppd/mKqnVuXRZwbh8JvqxW131MYdh1qXfyMdcbCub0ttqu/p9o8WBEv YdkjPVfbdtXKYtaTNb/OT/i9YPV5Zz7v+9s/d50PP6fEUpyRaKjFXFScCAD07lduDwMAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected 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.4 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 From: Kukjin Kim Remove useless inclusion for exynos. Signed-off-by: Kukjin Kim --- arch/arm/mach-exynos/common.c | 2 -- arch/arm/mach-exynos/include/mach/regs-irq.h | 19 ------------------- arch/arm/mach-exynos/pm.c | 1 - arch/arm/plat-samsung/pm.c | 2 ++ arch/arm/plat-samsung/s5p-irq-pm.c | 3 +++ 5 files changed, 5 insertions(+), 22 deletions(-) delete mode 100644 arch/arm/mach-exynos/include/mach/regs-irq.h diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index 1fc0424..52cef6a 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -37,8 +37,6 @@ #include #include -#include - #include #include #include diff --git a/arch/arm/mach-exynos/include/mach/regs-irq.h b/arch/arm/mach-exynos/include/mach/regs-irq.h deleted file mode 100644 index f2b5050..0000000 --- a/arch/arm/mach-exynos/include/mach/regs-irq.h +++ /dev/null @@ -1,19 +0,0 @@ -/* linux/arch/arm/mach-exynos4/include/mach/regs-irq.h - * - * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. - * http://www.samsung.com - * - * EXYNOS4 - IRQ register definitions - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. -*/ - -#ifndef __ASM_ARCH_REGS_IRQ_H -#define __ASM_ARCH_REGS_IRQ_H __FILE__ - -#include -#include - -#endif /* __ASM_ARCH_REGS_IRQ_H */ diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c index 717c6a6..d4a3368 100644 --- a/arch/arm/mach-exynos/pm.c +++ b/arch/arm/mach-exynos/pm.c @@ -29,7 +29,6 @@ #include #include -#include #include #include diff --git a/arch/arm/plat-samsung/pm.c b/arch/arm/plat-samsung/pm.c index d0c2301..47ec54b 100644 --- a/arch/arm/plat-samsung/pm.c +++ b/arch/arm/plat-samsung/pm.c @@ -29,7 +29,9 @@ #include #include #include +#ifndef CONFIG_ARCH_EXYNOS #include +#endif #include #endif diff --git a/arch/arm/plat-samsung/s5p-irq-pm.c b/arch/arm/plat-samsung/s5p-irq-pm.c index 7c1e3b7..5914980 100644 --- a/arch/arm/plat-samsung/s5p-irq-pm.c +++ b/arch/arm/plat-samsung/s5p-irq-pm.c @@ -22,7 +22,10 @@ #include #include + +#ifndef CONFIG_ARCH_EXYNOS #include +#endif /* state for IRQs over sleep */