From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758332AbYE2QoW (ORCPT ); Thu, 29 May 2008 12:44:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751203AbYE2QoO (ORCPT ); Thu, 29 May 2008 12:44:14 -0400 Received: from agminet01.oracle.com ([141.146.126.228]:57446 "EHLO agminet01.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752093AbYE2QoN (ORCPT ); Thu, 29 May 2008 12:44:13 -0400 Date: Thu, 29 May 2008 09:56:33 -0700 From: Randy Dunlap To: lkml Cc: Stephen Rothwell , linux-next@vger.kernel.org, dmitry.torokhov@gmail.com, akpm Subject: [PATCH linux-next] serio: add ifdef for i8042 build fix Message-Id: <20080529095633.8893b4ec.randy.dunlap@oracle.com> In-Reply-To: <20080529094454.3605aa5c.randy.dunlap@oracle.com> References: <20080529182556.2994310a.sfr@canb.auug.org.au> <20080529094454.3605aa5c.randy.dunlap@oracle.com> Organization: Oracle Linux Eng. X-Mailer: Sylpheed 2.4.8 (GTK+ 2.12.0; x86_64-unknown-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Brightmail-Tracker: AAAAAQAAAAI= X-Brightmail-Tracker: AAAAAQAAAAI= X-Whitelist: TRUE X-Whitelist: TRUE Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Randy Dunlap Restrict variable usage by bounding it with ifdef/endif CONFIG_PNP. linux-next-20080529/drivers/input/serio/i8042-x86ia64io.h:590: error: 'i8042_nopnp' undeclared (first use in this function) Signed-off-by: Randy Dunlap --- drivers/input/serio/i8042-x86ia64io.h | 2 ++ 1 file changed, 2 insertions(+) --- linux-next-20080529.orig/drivers/input/serio/i8042-x86ia64io.h +++ linux-next-20080529/drivers/input/serio/i8042-x86ia64io.h @@ -586,9 +586,11 @@ static int __init i8042_platform_init(vo i8042_aux_irq = I8042_MAP_IRQ(12); #if defined(__i386__) || defined(__x86_64__) +#ifdef CONFIG_PNP if (dmi_check_system(i8042_dmi_nopnp_table)) i8042_nopnp = 1; #endif +#endif retval = i8042_pnp_init(); if (retval) return retval; ---