From patchwork Fri Mar 4 16:43:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santosh Shilimkar X-Patchwork-Id: 609661 X-Patchwork-Delegate: paul@pwsan.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p24GhkQ8006726 for ; Fri, 4 Mar 2011 16:43:46 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759637Ab1CDQnn (ORCPT ); Fri, 4 Mar 2011 11:43:43 -0500 Received: from na3sys009aog103.obsmtp.com ([74.125.149.71]:38111 "EHLO na3sys009aog103.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759580Ab1CDQnm (ORCPT ); Fri, 4 Mar 2011 11:43:42 -0500 Received: from source ([209.85.216.176]) (using TLSv1) by na3sys009aob103.postini.com ([74.125.148.12]) with SMTP ID DSNKTXEWvMSnUWn5+cANyQxJOex4xl0TC5Nu@postini.com; Fri, 04 Mar 2011 08:43:42 PST Received: by mail-qy0-f176.google.com with SMTP id 30so2312908qyk.14 for ; Fri, 04 Mar 2011 08:43:40 -0800 (PST) Received: by 10.229.114.76 with SMTP id d12mr716530qcq.147.1299257019653; Fri, 04 Mar 2011 08:43:39 -0800 (PST) From: Santosh Shilimkar References: <3f332cbd75f835ca119bdeccd72c4bb2@mail.gmail.com> <4D6F89FB.7080201@ti.com> <4D70F25C.4040206@ti.com> MIME-Version: 1.0 X-Mailer: Microsoft Office Outlook 11 In-reply-to: <4D70F25C.4040206@ti.com> Thread-index: AcvadjT6nxPuDbA3SVqIu1ju6+FJDQAFCLbA X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.5579 Date: Fri, 4 Mar 2011 22:13:38 +0530 Message-ID: <58ec7480fe87b4d64c33cb2c4454a805@mail.gmail.com> Subject: RE: Integration branch base switchover to Tony's omap-for-linus branch To: Rajendra Nayak Cc: linux-omap@vger.kernel.org, Benoit Cousson , Paul Walmsley Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 04 Mar 2011 16:43:48 +0000 (UTC) diff --git a/arch/arm/mach-omap2/clockdomains44xx_data.c b/arch/arm/mach-omap2/clockdomains44xx_data.c index a607ec1..3c89bcc 100644 --- a/arch/arm/mach-omap2/clockdomains44xx_data.c +++ b/arch/arm/mach-omap2/clockdomains44xx_data.c @@ -281,6 +281,7 @@ static struct clkdm_dep l4_secure_wkup_sleep_deps[] = { }; static struct clkdm_dep mpuss_wkup_sleep_deps[] = { +#if 0 { .clkdm_name = "abe_clkdm",