Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760787AbZFLUr4 (ORCPT ); Fri, 12 Jun 2009 16:47:56 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756943AbZFLUrt (ORCPT ); Fri, 12 Jun 2009 16:47:49 -0400 Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]:54650 "EHLO atrey.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754715AbZFLUrs (ORCPT ); Fri, 12 Jun 2009 16:47:48 -0400 Date: Fri, 12 Jun 2009 22:47:44 +0200 From: Pavel Machek To: Brian Swetland Cc: kernel list , linux-arm-kernel , san@android.com, rlove@google.com, Greg KH Subject: HTC Dream compile fixes (was Re: HTC Dream aka. t-mobile g1 support) Message-ID: <20090612204744.GA18544@elf.ucw.cz> References: <20090610103131.GB13885@elf.ucw.cz> <20090610194852.GA28787@n2100.arm.linux.org.uk> <20090610213710.GA8472@elf.ucw.cz> <20090611082532.GE8592@elf.ucw.cz> <20090612150504.GA15084@elf.ucw.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090612150504.GA15084@elf.ucw.cz> X-Warning: Reading this can be dangerous to your mental health. User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1464 Lines: 45 Fix compilation of pwrsink with CONFIG_WAKELOCK disabled. Signed-off-by: Pavel Machek diff --git a/arch/arm/mach-msm/htc_pwrsink.c b/arch/arm/mach-msm/htc_pwrsink.c index 3105a7c..3d3c55c 100644 --- a/arch/arm/mach-msm/htc_pwrsink.c +++ b/arch/arm/mach-msm/htc_pwrsink.c @@ -229,11 +229,13 @@ void htc_pwrsink_resume_late(struct early_suspend *h) htc_pwrsink_set(PWRSINK_SYSTEM_LOAD, 38); } +#ifdef CONFIG_WAKELOCK struct early_suspend htc_pwrsink_early_suspend = { .level = EARLY_SUSPEND_LEVEL_DISABLE_FB + 1, .suspend = htc_pwrsink_suspend_early, .resume = htc_pwrsink_resume_late, }; +#endif static int __init htc_pwrsink_probe(struct platform_device *pdev) { @@ -252,10 +254,12 @@ static int __init htc_pwrsink_probe(struct platform_device *pdev) initialized = 1; +#ifdef CONFIG_WAKELOCK if (pdata->suspend_early) htc_pwrsink_early_suspend.suspend = pdata->suspend_early; if (pdata->resume_late) htc_pwrsink_early_suspend.resume = pdata->resume_late; +#endif register_early_suspend(&htc_pwrsink_early_suspend); return 0; -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html -- 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/