# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1203371696 -3600
# Node ID ab9cca571149d579c860a55ed0d682262c641b13
# Parent  d1ecaea3e7cf8a46323edce3e7bbf1edb8fadae1
Linux: patches compatible with busybox/patch

diff -r d1ecaea3e7cf -r ab9cca571149 linux/stuff/linux-lzma-2.6.24.2.u
--- a/linux/stuff/linux-lzma-2.6.24.2.u	Mon Feb 18 14:40:48 2008 +0100
+++ b/linux/stuff/linux-lzma-2.6.24.2.u	Mon Feb 18 22:54:56 2008 +0100
@@ -38,6 +38,7 @@
 +
 +$(obj)/piggy.o: $(src)/vmlinux_32.scr $(obj)/vmlinux.bin.$(suffix_y) FORCE
  	$(call if_changed,ld)
+
 --- linux-2.6.24.2/arch/x86/boot/compressed/Makefile_64
 +++ linux-2.6.24.2/arch/x86/boot/compressed/Makefile_64
 @@ -4,7 +4,7 @@
@@ -49,6 +50,7 @@
  
  KBUILD_CFLAGS := -m64 -D__KERNEL__ $(LINUXINCLUDE) -O2  \
  	  -fno-strict-aliasing -fPIC -mcmodel=small \
+
 --- linux-2.6.24.2/arch/x86/boot/compressed/misc_32.c
 +++ linux-2.6.24.2/arch/x86/boot/compressed/misc_32.c
 @@ -121,9 +121,12 @@ typedef unsigned long  ulg;
@@ -232,6 +234,7 @@
  	putstr("Ok, booting the kernel.\n");
  	return;
  }
+
 --- linux-2.6.24.2/arch/x86/boot/compressed/misc_64.c
 +++ linux-2.6.24.2/arch/x86/boot/compressed/misc_64.c
 @@ -121,9 +121,12 @@ typedef unsigned long  ulg;
@@ -411,6 +414,7 @@
  	putstr("done.\nBooting the kernel.\n");
  	return;
  }
+
 --- linux-2.6.24.2/drivers/block/Kconfig
 +++ linux-2.6.24.2/drivers/block/Kconfig
 @@ -356,6 +356,30 @@ config BLK_DEV_RAM_BLOCKSIZE
@@ -444,6 +448,7 @@
  config CDROM_PKTCDVD
  	tristate "Packet writing on CD/DVD media"
  	depends on !UML
+
 --- linux-2.6.24.2/include/linux/decompress_bunzip2.h
 +++ linux-2.6.24.2/include/linux/decompress_bunzip2.h
 @@ -0,0 +1,16 @@
@@ -463,6 +468,7 @@
 +		   int *pos);
 +
 +#endif
+
 --- linux-2.6.24.2/include/linux/decompress_generic.h
 +++ linux-2.6.24.2/include/linux/decompress_generic.h
 @@ -0,0 +1,28 @@
@@ -494,6 +500,7 @@
 + 
 +
 +#endif
+
 --- linux-2.6.24.2/include/linux/decompress_unlzma.h
 +++ linux-2.6.24.2/include/linux/decompress_unlzma.h
 @@ -0,0 +1,15 @@
@@ -512,6 +519,7 @@
 +		  int *pos);
 +
 +#endif
+
 --- linux-2.6.24.2/init/do_mounts_rd.c
 +++ linux-2.6.24.2/init/do_mounts_rd.c
 @@ -8,6 +8,16 @@
@@ -767,6 +775,7 @@
 +#endif
  
  #endif  /* BUILD_CRAMDISK */
+
 --- linux-2.6.24.2/init/initramfs.c
 +++ linux-2.6.24.2/init/initramfs.c
 @@ -7,6 +7,15 @@
@@ -903,6 +912,7 @@
  	free(name_buf);
  	free(symlink_buf);
  	free(header_buf);
+
 --- linux-2.6.24.2/init/Kconfig
 +++ linux-2.6.24.2/init/Kconfig
 @@ -92,6 +92,56 @@ config LOCALVERSION_AUTO
@@ -962,6 +972,7 @@
  config SWAP
  	bool "Support for paging of anonymous memory (swap)"
  	depends on MMU && BLOCK
+
 --- linux-2.6.24.2/lib/decompress_bunzip2.c
 +++ linux-2.6.24.2/lib/decompress_bunzip2.c
 @@ -0,0 +1,645 @@
@@ -1610,6 +1621,7 @@
 +	return i;
 +}
 +
+
 --- linux-2.6.24.2/lib/decompress_unlzma.c
 +++ linux-2.6.24.2/lib/decompress_unlzma.c
 @@ -0,0 +1,605 @@
@@ -2218,6 +2230,7 @@
 +	large_free(buffer);
 +	return -1;
 +}
+
 --- linux-2.6.24.2/lib/Makefile
 +++ linux-2.6.24.2/lib/Makefile
 @@ -50,6 +50,10 @@ obj-$(CONFIG_CRC7)	+= crc7.o
@@ -2231,6 +2244,7 @@
  obj-$(CONFIG_ZLIB_INFLATE) += zlib_inflate/
  obj-$(CONFIG_ZLIB_DEFLATE) += zlib_deflate/
  obj-$(CONFIG_REED_SOLOMON) += reed_solomon/
+
 --- linux-2.6.24.2/scripts/Makefile.lib
 +++ linux-2.6.24.2/scripts/Makefile.lib
 @@ -166,4 +166,17 @@ cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS)