wok diff linux/stuff/boot-kernel.u @ rev 3347

Up: mjpegtools (1.9.0) - Fix build and remove libiconv dep
author Christophe Lincoln <pankso@slitaz.org>
date Thu Jun 11 16:37:35 2009 +0200 (2009-06-11)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/linux/stuff/boot-kernel.u	Thu Jun 11 16:37:35 2009 +0200
     1.3 @@ -0,0 +1,11 @@
     1.4 +--- linux-2.6.22.9/init/initramfs.c
     1.5 ++++ linux-2.6.22.9/init/initramfs.c
     1.6 +@@ -549,7 +549,7 @@
     1.7 + 		panic(err);
     1.8 + #ifdef CONFIG_BLK_DEV_INITRD
     1.9 + 	if (initrd_start) {
    1.10 +-#ifdef CONFIG_BLK_DEV_RAM
    1.11 ++#ifdef NOT_IN_SLITAZ_CONFIG_BLK_DEV_RAM
    1.12 + 		int fd;
    1.13 + 		printk(KERN_INFO "checking if image is initramfs...");
    1.14 + 		err = unpack_to_rootfs((char *)initrd_start,