Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754987Ab1CKCfw (ORCPT ); Thu, 10 Mar 2011 21:35:52 -0500 Received: from e23smtp06.au.ibm.com ([202.81.31.148]:60823 "EHLO e23smtp06.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752226Ab1CKCfq (ORCPT ); Thu, 10 Mar 2011 21:35:46 -0500 Date: Fri, 11 Mar 2011 13:35:42 +1100 From: Stephen Rothwell To: Dave Jones Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "Rafael J. Wysocki" , Kukjin Kim Subject: linux-next: manual merge of the cpufreq tree with the s5p tree Message-Id: <20110311133542.8ffb094e.sfr@au1.ibm.com> X-Mailer: Sylpheed 3.1.0 (GTK+ 2.20.1; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1280 Lines: 35 Hi Dave, Today's linux-next merge of the cpufreq tree got a conflict in arch/arm/mach-exynos4/cpufreq.c between commit 7d30e8b3815f ("ARM: EXYNOS4: Add EXYNOS4 CPU initialization support") from the s5p tree and commit 44033b9c940e ([CPUFREQ] Remove the pm_message_t argument from driver suspend"") from the cpufreq tree (where this file is called arch/arm/mach-s5pv310/cpufreq.c). Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc arch/arm/mach-exynos4/cpufreq.c index a16ac35,7c08ad7..0000000 --- a/arch/arm/mach-exynos4/cpufreq.c +++ b/arch/arm/mach-exynos4/cpufreq.c @@@ -452,8 -458,7 +452,7 @@@ static int exynos4_target(struct cpufre } #ifdef CONFIG_PM - static int exynos4_cpufreq_suspend(struct cpufreq_policy *policy, - pm_message_t pmsg) -static int s5pv310_cpufreq_suspend(struct cpufreq_policy *policy) ++static int exynos4_cpufreq_suspend(struct cpufreq_policy *policy) { return 0; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/