Re: 2.4.19-rc1 doesn't link

[Paul Mackerras <paulus@samba.org>]

Richard Gooch writes:

>   Hi, all. Looks like initrd handling has been broken again:
> init/do_mounts.o: In function `rd_load_image':
> init/do_mounts.o(.text.init+0x941): undefined reference to `change_floppy'
> init/do_mounts.o: In function `rd_load_disk':
> init/do_mounts.o(.text.init+0xa9b): undefined reference to `change_floppy'
> make: *** [vmlinux] Error 1
> 
> This is the config option combination that exposed the bug:
> CONFIG_BLK_DEV_RAM=y
> # CONFIG_BLK_DEV_INITRD is not set

This should fix it...

Paul.

diff -urN linux-2.4.19-rc1/init/do_mounts.c pmac/init/do_mounts.c
--- linux-2.4.19-rc1/init/do_mounts.c	Tue Jun 25 01:23:40 2002
+++ pmac/init/do_mounts.c	Mon Jul  8 22:21:04 2002
@@ -378,7 +378,7 @@
 	return sys_symlink(path + n + 5, name);
 }
 
-#if defined(CONFIG_BLOCK_DEV_RAM) || defined(CONFIG_BLK_DEV_FD)
+#if defined(CONFIG_BLK_DEV_RAM) || defined(CONFIG_BLK_DEV_FD)
 static void __init change_floppy(char *fmt, ...)
 {
 	struct termios termios;