From patchwork Tue Mar 18 17:16:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 3848751 Return-Path: X-Original-To: patchwork-linux-arm@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 2773D9F375 for ; Tue, 18 Mar 2014 17:18:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2843B203A9 for ; Tue, 18 Mar 2014 17:18:36 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C09B92037F for ; Tue, 18 Mar 2014 17:18:31 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WPxdz-0000yw-QE; Tue, 18 Mar 2014 17:17:40 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WPxdn-0000mX-BS; Tue, 18 Mar 2014 17:17:27 +0000 Received: from mailout2.w1.samsung.com ([210.118.77.12]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WPxdC-0000gq-2y for linux-arm-kernel@lists.infradead.org; Tue, 18 Mar 2014 17:16:54 +0000 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout2.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N2N00KCQ6N3HE90@mailout2.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 18 Mar 2014 17:16:15 +0000 (GMT) X-AuditID: cbfec7f5-b7fc96d000004885-fb-53287f66b428 Received: from eusync1.samsung.com ( [203.254.199.211]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id F1.5A.18565.66F78235; Tue, 18 Mar 2014 17:16:22 +0000 (GMT) Received: from AMDC1227.digital.local ([106.116.147.199]) by eusync1.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0N2N009RN6N5CJ00@eusync1.samsung.com>; Tue, 18 Mar 2014 17:16:21 +0000 (GMT) From: Tomasz Figa To: linux-samsung-soc@vger.kernel.org Subject: [PATCH v2 4/6] ARM: SAMSUNG: Fix rebase error in pm-debug.c Date: Tue, 18 Mar 2014 18:16:02 +0100 Message-id: <1395162964-5916-4-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.9.0 In-reply-to: <1395162964-5916-1-git-send-email-t.figa@samsung.com> References: <1395162964-5916-1-git-send-email-t.figa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmplluLIzCtJLcpLzFFi42I5/e/4Zd20eo1gg9XHGC3+TjrGbrHp+nVW i94FV9ks3h96xmyx6fE1VosZ5/cxWZy6/pnNYv2M1ywOHB6/f01i9LhzbQ+bx+Yl9R63/z1m 9rhyoonVo2/LKkaPz5vkAtijuGxSUnMyy1KL9O0SuDIOnpvLXPCSreLlp0nsDYwPWbsYOTkk BEwkJl86wQRhi0lcuLeerYuRi0NIYCmjxMvd39khnD4micln37CBVLEJqEl8bngEZosIqEp8 blsAVsQs8JVR4seNJ2BjhQVcJG5uWMYOYrMAFW1adQRsBa+Ao8SRe9tZINbJSUz5vQCshlPA SeLJlAWMILYQUM2Tk1dYJjDyLmBkWMUomlqaXFCclJ5rpFecmFtcmpeul5yfu4kREnRfdzAu PWZ1iFGAg1GJh1ciViNYiDWxrLgy9xCjBAezkgjvanegEG9KYmVValF+fFFpTmrxIUYmDk6p BsbEmZc8r7pvCy7XVFJmWHya8XZ9a034zQgdj44nkbkJC5rn33O79IOp9f35J70O3+ZfXPsz TOrTv9J1u1UdXiqbbRJmV/45dfmco88PdljOP2F1Zxb359oKD+OLFr+KfivMOKvsL7d04tyP MmmGReZHV4m0r2j3nmsv0vtoP8dhx7kxBqF9EyYosRRnJBpqMRcVJwIAq1rpJxgCAAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140318_131650_262637_D661BA51 X-CRM114-Status: UNSURE ( 9.47 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -6.9 (------) Cc: Kukjin Kim , Arnd Bergmann , Mark Brown , Tomasz Figa , linaro-kernel@lists.linaro.org, Olof Johansson , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 Recent Samsung header clean-up series did heavy reorganization of various Samsung-specific headers, unfortunately causing a conflict with Samsung PM consolidation series part 2 - multiplatform) and resulting with a merge error that caused a build failure, due to a missing header being included. This patch fixes this by removing incorrect header inclusion. Signed-off-by: Tomasz Figa --- arch/arm/plat-samsung/pm-debug.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/plat-samsung/pm-debug.c b/arch/arm/plat-samsung/pm-debug.c index 602998b..88bb4cf 100644 --- a/arch/arm/plat-samsung/pm-debug.c +++ b/arch/arm/plat-samsung/pm-debug.c @@ -20,7 +20,6 @@ #include #include -#include #ifdef CONFIG_SAMSUNG_ATAGS #include