Messages in this thread Patch in this message | | | Date | Mon, 28 Dec 1998 20:06:37 -0700 (MST) | From | Jeremy Katz <> | Subject | PCMCIA + 2.2.0-pre1 |
| |
Well, I've installed 2.2.0-pre1 successfully on two machines without major problems thus far. The only problem was with PCMCIA on my laptop. It fails as we are *gasp* not in 2.1 anymore ;) Also, the version it reported needed to be corrected so that they would load. Attached is my simple diff. It also comments out the compile of the SCSI modules as I lost track of the patch from last week to stop that error.
=-=--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- Jeremy Katz | linuxpower.org -- Helping Users Harness Admin, NCSSM Unix Network | the Power of Linux katzj@shells.technojunkie.com | http://linuxpower.org katzj@iname.com | unknwn@linuxpower.org "Microsoft is to software what McDonalds is to gourmet cooking" -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= diff -r -u pcmcia-cs-3.0.6/Configure pcmcia-cs-19981228-jk/Configure --- pcmcia-cs-3.0.6/Configure Thu Nov 19 03:08:42 1998 +++ pcmcia-cs-19981228-jk/Configure Mon Dec 28 20:59:58 1998 @@ -151,7 +151,8 @@ VERSION=`sed -n -e 's/^VERSION = \(.*\)/\1/p' $LINUX/Makefile` PATCHLEVEL=`sed -n -e 's/^PATCHLEVEL = \(.*\)/\1/p' $LINUX/Makefile` SUBLEVEL=`sed -n -e 's/^SUBLEVEL = \(.*\)/\1/p' $LINUX/Makefile` -SRC_RELEASE=$VERSION.$PATCHLEVEL.$SUBLEVEL +EXTRAVERSION=`sed -n -e 's/^EXTRAVERSION =-\(.*\)/\1/p' $LINUX/Makefile` +SRC_RELEASE=$VERSION.$PATCHLEVEL.$SUBLEVEL-$EXTRAVERSION VERSION_CODE=`expr $VERSION \* 65536 + $PATCHLEVEL \* 256 + $SUBLEVEL` echo "The kernel source tree is version $SRC_RELEASE." CUR_RELEASE=`uname -r` @@ -426,7 +427,7 @@ NEW_QLOGIC=n case "$VERSION.$PATCHLEVEL" in -2.0|2.1) +2.0|2.1|2.2) echo "MFLAG=-DMODVERSIONS -include $MODVER" >> $CONFIG_MK if [ $SUBLEVEL -ge 6 ] ; then NEW_QLOGIC=y Only in pcmcia-cs-19981228-jk/cardmgr: .depfiles Only in pcmcia-cs-19981228-jk/clients: .depfiles diff -r -u pcmcia-cs-3.0.6/clients/Makefile pcmcia-cs-19981228-jk/clients/Makefile --- pcmcia-cs-3.0.6/clients/Makefile Wed Nov 18 02:37:50 1998 +++ pcmcia-cs-19981228-jk/clients/Makefile Mon Dec 28 19:40:52 1998 @@ -67,8 +67,8 @@ SCSI=$(LINUX)/drivers/scsi ifdef CONFIG_SCSI -MODULES := ${MODULES} qlogic_cs.o aha152x_cs.o fdomain_cs.o -SRCS := ${SRCS} qlogic_cs.c aha152x_cs.c fdomain_cs.c +#MODULES := ${MODULES} qlogic_cs.o aha152x_cs.o fdomain_cs.o +#SRCS := ${SRCS} qlogic_cs.c aha152x_cs.c fdomain_cs.c endif all: $(MODULES) $(EXTRA) | |