I've made two changes to 2.1.66 to make it compilable (again) if the
source tree is not located in /usr/src/linux.
A small fix to the PCI2000 driver is included, too.
I also had to make a change to make Magic Sysrq compilable as a module.
These changes work for me, but they may have unexpected side effects ;-)
I rely on you to sort it out.
When will the Vortex/Boomerang driver (3c59x.c) be updated? The version
included in 2.1.66 is not usable with a 3C900 Combo, eg.
hjb
--------------------------------------------------------------------------
--------------------------------------------------------------------------
diff -r -u linux-2.1.66.orig/drivers/char/Makefile linux-2.1.66.new/drivers/char/Makefile
--- linux-2.1.66.orig/drivers/char/Makefile Sat Nov 29 18:49:26 1997
+++ linux-2.1.66.new/drivers/char/Makefile Wed Nov 26 20:38:40 1997
@@ -44,9 +44,6 @@
ifneq ($(ARCH),m68k)
L_OBJS += pc_keyb.o defkeymap.o
endif
-ifdef CONFIG_MAGIC_SYSRQ
-L_OBJS += sysrq.o
-endif
endif
ifeq ($(CONFIG_ATARI_DSP56K),y)
@@ -347,12 +344,20 @@
endif
endif
+ifeq ($(CONFIG_MAGIC_SYSRQ),y)
+L_OBJS += sysrq.o
+else
+ ifeq ($(CONFIG_MAGIC_SYSRQ),m)
+ M_OBJS += sysrq.o
+ endif
+endif
+
include $(TOPDIR)/Rules.make
fastdep:
conmakehash: conmakehash.c
- $(HOSTCC) -o conmakehash conmakehash.c
+ $(CC) -o conmakehash conmakehash.c
consolemap_deftbl.c: $(FONTMAPFILE) conmakehash
./conmakehash $(FONTMAPFILE) > consolemap_deftbl.c
diff -r -u linux-2.1.66.orig/drivers/scsi/pci2000.c linux-2.1.66.new/drivers/scsi/pci2000.c
--- linux-2.1.66.orig/drivers/scsi/pci2000.c Sat Nov 29 18:48:17 1997
+++ linux-2.1.66.new/drivers/scsi/pci2000.c Thu Nov 13 19:43:46 1997
@@ -653,6 +653,7 @@
#ifdef MODULE
/* Eventually this will go into an include file, but this will be later */
+#include "pci2220i.h"
Scsi_Host_Template driver_template = PCI2220I;
#include "scsi_module.c"
diff -r -u linux-2.1.66.orig/drivers/sound/Makefile linux-2.1.66/drivers/sound/Makefile
--- linux-2.1.66.orig/drivers/sound/Makefile Sat Nov 29 18:48:17 1997
+++ linux-2.1.66/drivers/sound/Makefile Wed Nov 26 20:14:04 1997
@@ -89,6 +89,7 @@
USE_DEPEND=y
else
include $(TOPDIR)/Rules.make
+HOSTCC = $(CC)
endif
sound.a: $(OBJS)
@@ -137,7 +138,7 @@
kernelconfig: setup
rm -f configure
- $(HOSTCC) -o configure configure.c
+ $(HOSTCC) $(CFLAGS) -o configure configure.c
./configure fixedlocal > local.h
./configure fixeddefines > .defines
@echo \#define SOUND_CONFIG_DATE \"`date`\" >> local.h
@@ -148,7 +149,7 @@
mkscript: setup
rm -f configure
- $(HOSTCC) -o configure configure.c
+ $(HOSTCC) $(CFLAGS) -o configure configure.c
./configure script > Config.in
cat lowlevel/Config.tmpl >> Config.in
./configure fixedlocal > local.h
@@ -159,7 +160,7 @@
rm Config.in;cp Config.std Config.in
configure: configure.c
- $(HOSTCC) -o configure configure.c
+ $(HOSTCC) $(CFLAGS) -o configure configure.c
@cat .blurb
dep:
--
Veni, Vidi, VISA:
I came, I saw, I did a little shopping.