From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262870AbTJNScS (ORCPT ); Tue, 14 Oct 2003 14:32:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262747AbTJNScR (ORCPT ); Tue, 14 Oct 2003 14:32:17 -0400 Received: from [212.57.164.72] ([212.57.164.72]:39686 "EHLO mail.ward.six") by vger.kernel.org with ESMTP id S262745AbTJNScN (ORCPT ); Tue, 14 Oct 2003 14:32:13 -0400 Date: Wed, 15 Oct 2003 00:30:36 +0600 From: Denis Zaitsev To: linux-kernel@vger.kernel.org Cc: linux-scsi@vger.kernel.org Subject: [PATCH TRIVIAL] Compile error in 2.4.22 without PCI Message-ID: <20031015003036.A10226@natasha.ward.six> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org I have these warnings when I'm compiling 2.4.22 for a 486 EISA system: aic7xxx_osm.c: In function `ahc_softc_comp': aic7xxx_osm.c:1560: warning: implicit declaration of function `ahc_get_pci_bus' aic7xxx_osm.c:1568: warning: implicit declaration of function `ahc_get_pci_slot' And then the make finishes with an error, because these functions really exist only if the PCI support is turned on. The patch below fixes this. And the same patch fits for the 2.6 kernels. Please, apply it. --- drivers/scsi/aic7xxx/aic7xxx_osm.c.orig 2003-09-15 01:56:14.000000000 +0600 +++ drivers/scsi/aic7xxx/aic7xxx_osm.c 2003-10-15 00:23:37.000000000 +0600 @@ -1552,6 +1552,7 @@ ahc_softc_comp(struct ahc_softc *lahc, s /* Still equal. Sort by BIOS address, ioport, or bus/slot/func. */ switch (rvalue) { +#ifdef CONFIG_PCI case AHC_PCI: { char primary_channel; @@ -1584,6 +1585,8 @@ ahc_softc_comp(struct ahc_softc *lahc, s value = 1; break; } +#endif +#ifdef CONFIG_EISA case AHC_EISA: if ((rahc->flags & AHC_BIOS_ENABLED) != 0) { value = rahc->platform_data->bios_address @@ -1593,6 +1596,7 @@ ahc_softc_comp(struct ahc_softc *lahc, s - lahc->bsh.ioport; } break; +#endif default: panic("ahc_softc_sort: invalid bus type"); }