[PATCH TRIVIAL] Compile error in 2.4.22 without PCI

From: Denis Zaitsev (zzz_at_anda.ru)
Date: 10/31/03

  • Next message: Chris Vine: "Re: 2.6.0-test9 - poor swap performance on low end machines" 
    Date:	Sat, 1 Nov 2003 02:29:38 +0500
To: marcelo.tosatti@cyclades.com, gibbs@scsiguy.com

    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");
             }
    -
    To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  • Next message: Chris Vine: "Re: 2.6.0-test9 - poor swap performance on low end machines"

    Relevant Pages