From patchwork Thu Mar 25 18:29:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 88305 Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2PIYQ1D014120 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 25 Mar 2010 18:35:03 GMT Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1Nurrr-0001WG-Ou; Thu, 25 Mar 2010 18:33:19 +0000 Received: from sfi-mx-1.v28.ch3.sourceforge.com ([172.29.28.121] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1NurpU-0002uT-KL for dri-devel@lists.sourceforge.net; Thu, 25 Mar 2010 18:30:52 +0000 X-ACL-Warn: Received: from acsinet11.oracle.com ([141.146.126.233]) by sfi-mx-1.v28.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.69) id 1NurpT-0008A7-Ia for dri-devel@lists.sourceforge.net; Thu, 25 Mar 2010 18:30:52 +0000 Received: from acsinet15.oracle.com (acsinet15.oracle.com [141.146.126.227]) by acsinet11.oracle.com (Switch-3.4.2/Switch-3.4.2) with ESMTP id o2PIUXfN012994 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 25 Mar 2010 18:30:35 GMT Received: from acsmt353.oracle.com (acsmt353.oracle.com [141.146.40.153]) by acsinet15.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id o2PIUURo006531; Thu, 25 Mar 2010 18:30:31 GMT Received: from abhmt013.oracle.com by acsmt354.oracle.com with ESMTP id 116781931269541747; Thu, 25 Mar 2010 11:29:07 -0700 Received: from chimera.site (/71.245.98.113) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 25 Mar 2010 11:29:06 -0700 Message-ID: <4BABAB71.3010402@oracle.com> Date: Thu, 25 Mar 2010 11:29:05 -0700 From: Randy Dunlap Organization: Oracle Linux Engineering User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.5) Gecko/20091209 Fedora/3.0-3.fc11 Thunderbird/3.0 MIME-Version: 1.0 To: Stephen Rothwell Subject: [PATCH 1/3 -next] drm: fix build error when SYSRQ is disabled References: <20100325173853.f06a7b33.sfr@canb.auug.org.au> In-Reply-To: <20100325173853.f06a7b33.sfr@canb.auug.org.au> X-Source-IP: acsmt353.oracle.com [141.146.40.153] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090209.4BABABC9.0185:SCFMA4539814,ss=1,fgs=0 X-Spam-Score: 0.0 (/) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines 0.0 AWL AWL: From: address is in the auto white-list X-Headers-End: 1NurpT-0008A7-Ia X-Mailman-Approved-At: Thu, 25 Mar 2010 18:33:18 +0000 Cc: Andrew Morton , David Airlie , linux-next@vger.kernel.org, LKML , dri-devel@lists.sourceforge.net X-BeenThere: dri-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.sourceforge.net X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 25 Mar 2010 18:35:03 +0000 (UTC) --- linux-next-20100325.orig/drivers/gpu/drm/drm_fb_helper.c +++ linux-next-20100325/drivers/gpu/drm/drm_fb_helper.c @@ -283,6 +283,8 @@ static struct sysrq_key_op sysrq_drm_fb_ .help_msg = "force-fb(V)", .action_msg = "Restore framebuffer console", }; +#else +static struct sysrq_key_op sysrq_drm_fb_helper_restore_op = { }; #endif static void drm_fb_helper_on(struct fb_info *info)