From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id ; Mon, 13 Aug 2001 23:04:53 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id ; Mon, 13 Aug 2001 23:04:44 -0400 Received: from mailgate.indstate.edu ([139.102.15.118]:48366 "EHLO mailgate.indstate.edu") by vger.kernel.org with ESMTP id ; Mon, 13 Aug 2001 23:04:39 -0400 Content-Type: text/plain; charset=US-ASCII From: Rich Baum To: linux-kernel@vger.kernel.org Subject: [PATCH] fix 2.4.8 compile errors Date: Mon, 13 Aug 2001 21:47:28 -0500 X-Mailer: KMail [version 1.2.9] Cc: Linus Torvalds , Alan Cox MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Message-ID: <100C620A6B75@coral.indstate.edu> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org This patch fixes two compile errors I get when compiling 2.4.8 on my K6-2. Both of these errors are caused by compiling drivers for other architectures. I've changed the Config.in files to keep these options from being selected on the wrong architecture. Let me know if you have any questions about this patch. Rich diff -urN -X dontdiff linux-2.4.8/drivers/net/Config.in rb/drivers/net/Config.in --- linux-2.4.8/drivers/net/Config.in Sat Aug 11 11:10:07 2001 +++ rb/drivers/net/Config.in Mon Aug 13 20:43:41 2001 @@ -28,7 +28,8 @@ bool 'Ethernet (10 or 100Mbit)' CONFIG_NET_ETHERNET if [ "$CONFIG_NET_ETHERNET" = "y" ]; then - dep_bool ' ARM EBSA110 AM79C961A support' CONFIG_ARM_AM79C961A $CONFIG_ARCH_EBSA110 + if [ "$ARCH" = "arm" ]; then + dep_bool ' ARM EBSA110 AM79C961A support' CONFIG_ARM_AM79C961A $CONFIG_ARCH_EBSA110 if [ "$CONFIG_ARCH_ACORN" = "y" ]; then source drivers/acorn/net/Config.in fi diff -urN -X dontdiff linux-2.4.8/drivers/video/Config.in rb/drivers/video/Config.in --- linux-2.4.8/drivers/video/Config.in Sat Aug 11 11:10:30 2001 +++ rb/drivers/video/Config.in Mon Aug 13 20:43:46 2001 @@ -103,7 +103,8 @@ fi tristate ' NEC PowerVR 2 display support' CONFIG_FB_PVR2 dep_bool ' Debug pvr2fb' CONFIG_FB_PVR2_DEBUG $CONFIG_FB_PVR2 - bool ' Epson 1355 framebuffer support' CONFIG_FB_E1355 + if [ "$ARCH" = "sh" ]; then + bool ' Epson 1355 framebuffer support' CONFIG_FB_E1355 if [ "$CONFIG_FB_E1355" = "y" ]; then hex ' Register Base Address' CONFIG_E1355_REG_BASE a8000000 hex ' Framebuffer Base Address' CONFIG_E1355_FB_BASE a8200000