X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/7b7737acaf899ce8a50426c2a09c1c2d1c4380db..adde7768a2eab2950a7628319ec832c63a00ff03:/target/linux/generic-2.6/patches-2.6.22/065-rootfs_split.patch

diff --git a/target/linux/generic-2.6/patches-2.6.22/065-rootfs_split.patch b/target/linux/generic-2.6/patches-2.6.22/065-rootfs_split.patch
index 7d9d4ca11..12723d851 100644
--- a/target/linux/generic-2.6/patches-2.6.22/065-rootfs_split.patch
+++ b/target/linux/generic-2.6/patches-2.6.22/065-rootfs_split.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.22.1/drivers/mtd/Kconfig
-===================================================================
---- linux-2.6.22.1.orig/drivers/mtd/Kconfig	2007-08-19 23:30:07.068115074 +0200
-+++ linux-2.6.22.1/drivers/mtd/Kconfig	2007-08-19 23:31:43.961636725 +0200
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
 @@ -47,6 +47,16 @@
  	  devices. Partitioning on NFTL 'devices' is a different - that's the
  	  'normal' form of partitioning used on a block device.
@@ -19,10 +17,8 @@ Index: linux-2.6.22.1/drivers/mtd/Kconfig
  config MTD_REDBOOT_PARTS
  	tristate "RedBoot partition table parsing"
  	depends on MTD_PARTITIONS
-Index: linux-2.6.22.1/drivers/mtd/mtdpart.c
-===================================================================
---- linux-2.6.22.1.orig/drivers/mtd/mtdpart.c	2007-08-19 23:30:07.076115531 +0200
-+++ linux-2.6.22.1/drivers/mtd/mtdpart.c	2007-08-19 23:31:44.065642653 +0200
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
 @@ -20,6 +20,8 @@
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/partitions.h>
@@ -544,7 +540,7 @@ Index: linux-2.6.22.1/drivers/mtd/mtdpart.c
  		}
  	}
  
-@@ -557,7 +728,33 @@
+@@ -557,6 +728,32 @@
  	return ret;
  }
  
@@ -577,11 +573,8 @@ Index: linux-2.6.22.1/drivers/mtd/mtdpart.c
 +EXPORT_SYMBOL_GPL(refresh_mtd_partitions);
  EXPORT_SYMBOL_GPL(register_mtd_parser);
  EXPORT_SYMBOL_GPL(deregister_mtd_parser);
- 
-Index: linux-2.6.22.1/drivers/mtd/devices/block2mtd.c
-===================================================================
---- linux-2.6.22.1.orig/drivers/mtd/devices/block2mtd.c	2007-08-19 23:30:49.794549917 +0200
-+++ linux-2.6.22.1/drivers/mtd/devices/block2mtd.c	2007-08-19 23:31:44.025640373 +0200
+--- a/drivers/mtd/devices/block2mtd.c
++++ b/drivers/mtd/devices/block2mtd.c
 @@ -34,6 +34,8 @@
  	struct block_device *blkdev;
  	struct mtd_info mtd;
@@ -869,10 +862,8 @@ Index: linux-2.6.22.1/drivers/mtd/devices/block2mtd.c
  	
  	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
  	part->name = dev->mtd.name;
-Index: linux-2.6.22.1/drivers/mtd/mtdchar.c
-===================================================================
---- linux-2.6.22.1.orig/drivers/mtd/mtdchar.c	2007-08-19 23:30:07.096116671 +0200
-+++ linux-2.6.22.1/drivers/mtd/mtdchar.c	2007-08-19 23:31:44.041641284 +0200
+--- a/drivers/mtd/mtdchar.c
++++ b/drivers/mtd/mtdchar.c
 @@ -16,6 +16,7 @@
  
  #include <linux/mtd/mtd.h>
@@ -895,10 +886,8 @@ Index: linux-2.6.22.1/drivers/mtd/mtdchar.c
  
  	default:
  		ret = -ENOTTY;
-Index: linux-2.6.22.1/include/linux/mtd/mtd.h
-===================================================================
---- linux-2.6.22.1.orig/include/linux/mtd/mtd.h	2007-08-19 23:30:07.100116893 +0200
-+++ linux-2.6.22.1/include/linux/mtd/mtd.h	2007-08-19 23:31:44.105644933 +0200
+--- a/include/linux/mtd/mtd.h
++++ b/include/linux/mtd/mtd.h
 @@ -98,6 +98,7 @@
  	uint8_t		*oobbuf;
  };
@@ -917,10 +906,8 @@ Index: linux-2.6.22.1/include/linux/mtd/mtd.h
  	/* If the driver is something smart, like UBI, it may need to maintain
  	 * its own reference counting. The below functions are only for driver.
  	 * The driver may register its callbacks. These callbacks are not
-Index: linux-2.6.22.1/include/linux/mtd/partitions.h
-===================================================================
---- linux-2.6.22.1.orig/include/linux/mtd/partitions.h	2007-08-19 23:30:07.112117591 +0200
-+++ linux-2.6.22.1/include/linux/mtd/partitions.h	2007-08-19 23:31:44.133646528 +0200
+--- a/include/linux/mtd/partitions.h
++++ b/include/linux/mtd/partitions.h
 @@ -36,6 +36,7 @@
   * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
   */
@@ -945,10 +932,8 @@ Index: linux-2.6.22.1/include/linux/mtd/partitions.h
  
  /*
   * Functions dealing with the various ways of partitioning the space
-Index: linux-2.6.22.1/include/mtd/mtd-abi.h
-===================================================================
---- linux-2.6.22.1.orig/include/mtd/mtd-abi.h	2007-08-19 23:30:07.124118264 +0200
-+++ linux-2.6.22.1/include/mtd/mtd-abi.h	2007-08-19 23:31:44.157647897 +0200
+--- a/include/mtd/mtd-abi.h
++++ b/include/mtd/mtd-abi.h
 @@ -95,6 +95,7 @@
  #define ECCGETLAYOUT		_IOR('M', 17, struct nand_ecclayout)
  #define ECCGETSTATS		_IOR('M', 18, struct mtd_ecc_stats)