aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.22
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2007-07-19 15:52:37 +0000
committerGabor Juhos <juhosg@openwrt.org>2007-07-19 15:52:37 +0000
commita66d3dd9d2556aec2f3734494e666745372661b3 (patch)
treeb988a8ebefe10a8c1334853ec9e1161754b519d7 /target/linux/generic-2.6/patches-2.6.22
parent641592885472cfdd2dfb55874c551ee7b4ac35ee (diff)
downloadupstream-a66d3dd9d2556aec2f3734494e666745372661b3.tar.gz
upstream-a66d3dd9d2556aec2f3734494e666745372661b3.tar.bz2
upstream-a66d3dd9d2556aec2f3734494e666745372661b3.zip
rootfs_split fixes * avoid compiler warnings on 2.6.22.1 * applies cleanly on 2.6.21.5
SVN-Revision: 8060
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.22')
-rw-r--r--target/linux/generic-2.6/patches-2.6.22/060-rootfs_split.patch4
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++;