Here are some more solutions for problems with 2.2.0pre1:
* The PromiseDC4030 driver uses ide_multwrite, which is defined for
CONFIG_BLK_DEV_IDEDISK only
* ATA SCSI-emulation requires the SCSI-subsystet to link (obviously)
* The size of the ramdisk (rd.c) couldn't be set when loaded as a module
* LAPB over ethernet requires CONFIG_LAPB, the test for !="n" isn't good
enough size it can be "" in case of CONFIG_EXPERIMENTAL
* sdla_x25 gave an #error in case of modular-compilation, but this is no
longer required since Alan Cox fixed the wanmain.c driver
* drivers/sound/Makefile assumed that "." was in the current path for
the hex2hex program (was ok for bin2hex), I added a "./" (not /. :-)
Greetings,
Arjan van de Ven
diff -r -u linux/drivers/block/Config.in /usr/src/linux/drivers/block/Config.in
--- linux/drivers/block/Config.in Sun Dec 27 19:23:06 1998
+++ /usr/src/linux/drivers/block/Config.in Wed Dec 30 13:23:53 1998
@@ -69,7 +69,7 @@
bool ' QDI QD6580 support' CONFIG_BLK_DEV_QD6580
bool ' UMC-8672 support' CONFIG_BLK_DEV_UMC8672
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
- if [ "$CONFIG_BLK_DEV_IDE" = "y" ]; then
+ if [ "$CONFIG_BLK_DEV_IDEDISK" = "y" ]; then
bool ' PROMISE DC4030 support (EXPERIMENTAL)' CONFIG_BLK_DEV_PDC4030
fi
fi
diff -r -u linux/drivers/block/ide.c /usr/src/linux/drivers/block/ide.c
--- linux/drivers/block/ide.c Sun Dec 27 19:21:24 1998
+++ /usr/src/linux/drivers/block/ide.c Wed Dec 30 22:51:54 1998
@@ -2703,7 +2703,11 @@
(void) idefloppy_init();
#endif /* CONFIG_BLK_DEV_IDEFLOPPY */
#ifdef CONFIG_BLK_DEV_IDESCSI
+ #if defined(CONFIG_SCSI)
(void) idescsi_init();
+ #else
+ #warning SCSI emulation ignored due to missing SCSI-subsystem
+ #endif
#endif /* CONFIG_BLK_DEV_IDESCSI */
}
diff -r -u linux/drivers/block/rd.c /usr/src/linux/drivers/block/rd.c
--- linux/drivers/block/rd.c Mon Aug 24 22:47:39 1998
+++ /usr/src/linux/drivers/block/rd.c Thu Dec 31 10:07:56 1998
@@ -299,6 +299,8 @@
#ifdef MODULE
+MODULE_PARM(rd_size,"1i");
+
int init_module(void)
{
int error = rd_init();
@@ -318,6 +320,8 @@
unregister_blkdev( MAJOR_NR, "ramdisk" );
blk_dev[MAJOR_NR].request_fn = 0;
}
+
+
#endif /* MODULE */
diff -r -u linux/drivers/net/Config.in /usr/src/linux/drivers/net/Config.in
--- linux/drivers/net/Config.in Thu Dec 31 10:10:52 1998
+++ /usr/src/linux/drivers/net/Config.in Wed Dec 30 13:23:15 1998
@@ -248,7 +248,7 @@
# X.25 network drivers
#
if [ "$CONFIG_X25" != "n" ]; then
-if [ "$CONFIG_LAPB" != "n" ]; then
+if [ "$CONFIG_LAPB" = "y" -o "$CONFIG_LAPB" = "n" ]; then
dep_tristate 'LAPB over Ethernet driver' CONFIG_LAPBETHER $CONFIG_LAPB
dep_tristate 'X.25 async driver' CONFIG_X25_ASY $CONFIG_LAPB
fi
diff -r -u linux/drivers/net/sdla_x25.c /usr/src/linux/drivers/net/sdla_x25.c
--- linux/drivers/net/sdla_x25.c Sun Dec 27 19:21:26 1998
+++ /usr/src/linux/drivers/net/sdla_x25.c Tue Dec 29 21:34:29 1998
@@ -38,9 +38,6 @@
* Jan 07, 1997 Gene Kozin Initial version.
*****************************************************************************/
-#if !defined(__KERNEL__) || !defined(MODULE)
-#error This code MUST be compiled as a kernel module!
-#endif
#include <linux/kernel.h> /* printk(), and other useful stuff */
#include <linux/stddef.h> /* offsetof(), etc. */
diff -r -u linux/drivers/sound/Makefile /usr/src/linux/drivers/sound/Makefile
--- linux/drivers/sound/Makefile Sun Dec 27 19:24:21 1998
+++ /usr/src/linux/drivers/sound/Makefile Wed Dec 30 15:09:47 1998
@@ -296,7 +296,7 @@
ifeq ($(CONFIG_TRIX_HAVE_BOOT),y)
trix_boot.h: $(patsubst "%", %, $(CONFIG_TRIX_BOOT_FILE)) hex2hex
- hex2hex -i trix_boot < $(CONFIG_TRIX_BOOT_FILE) > $@
+ ./hex2hex -i trix_boot < $(CONFIG_TRIX_BOOT_FILE) > $@
else
trix_boot.h:
( \
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/