diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-07-19 15:52:37 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-07-19 15:52:37 +0000 |
| commit | fc66ff967a15d664e2543d6a996d792ed39f6759 (patch) | |
| tree | 65e4f4cab0d5629731647c0734763fda462aa12b /target/linux/generic-2.6/patches-2.6.22/060-rootfs_split.patch | |
| parent | 72d5517429d7f4ebce1944220e92a7085e39016d (diff) | |
rootfs_split fixes
* avoid compiler warnings on 2.6.22.1
* applies cleanly on 2.6.21.5
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8060 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.22/060-rootfs_split.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.22/060-rootfs_split.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.22/060-rootfs_split.patch b/target/linux/generic-2.6/patches-2.6.22/060-rootfs_split.patch index c8fe052b83..9900cace4e 100644 --- a/target/linux/generic-2.6/patches-2.6.22/060-rootfs_split.patch +++ b/target/linux/generic-2.6/patches-2.6.22/060-rootfs_split.patch @@ -461,7 +461,7 @@ Index: linux/drivers/mtd/mtdpart.c + j++; + + if (strcmp(part->name, "rootfs") == 0 && slave->registered) { -+#if CONFIG_MTD_ROOTFS_ROOT_DEV ++#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV + if (ROOT_DEV == 0) { + printk(KERN_NOTICE "mtd: partition \"rootfs\" " + "set to be root filesystem\n"); @@ -480,7 +480,7 @@ Index: linux/drivers/mtd/mtdpart.c - add_mtd_device(&slave->mtd); - slave->registered = 1; +#endif -+#if CONFIG_MTD_ROOTFS_SPLIT ++#ifdef CONFIG_MTD_ROOTFS_SPLIT + ret = split_rootfs_data(master, part, j); + if (ret == 0) + j++; |