diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-07-17 14:10:39 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2010-07-17 14:10:39 +0000 |
| commit | c5ef57706de0ef3e4ede1b404ef43510bb22e6d9 (patch) | |
| tree | 2a14f0b332c80242d488f0de7b0c351b00ee9dea /target/linux/generic/patches-2.6.35/065-rootfs_split.patch | |
| parent | 1d7a6ebc79e71dbc9085efab8205134bc769159b (diff) | |
| download | upstream-c5ef57706de0ef3e4ede1b404ef43510bb22e6d9.tar.gz upstream-c5ef57706de0ef3e4ede1b404ef43510bb22e6d9.tar.bz2 upstream-c5ef57706de0ef3e4ede1b404ef43510bb22e6d9.zip | |
kernel: refresh patches
SVN-Revision: 22252
Diffstat (limited to 'target/linux/generic/patches-2.6.35/065-rootfs_split.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.35/065-rootfs_split.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/generic/patches-2.6.35/065-rootfs_split.patch b/target/linux/generic/patches-2.6.35/065-rootfs_split.patch index d70d1835a3..a6766de466 100644 --- a/target/linux/generic/patches-2.6.35/065-rootfs_split.patch +++ b/target/linux/generic/patches-2.6.35/065-rootfs_split.patch @@ -534,9 +534,9 @@ mutex_init(&dev->write_mutex); + rwlock_init(&dev->bdev_mutex); - if (!mtdname) - mtdname = devname; -@@ -298,6 +392,7 @@ static struct block2mtd_dev *add_device( + /* Setup the MTD structure */ + /* make the name contain the block device in */ +@@ -299,6 +393,7 @@ static struct block2mtd_dev *add_device( dev->mtd.read = block2mtd_read; dev->mtd.priv = dev; dev->mtd.owner = THIS_MODULE; @@ -546,7 +546,7 @@ part->name = dev->mtd.name; --- a/drivers/mtd/mtdchar.c +++ b/drivers/mtd/mtdchar.c -@@ -18,6 +18,7 @@ +@@ -19,6 +19,7 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/compatmac.h> @@ -554,7 +554,7 @@ #include <asm/uaccess.h> -@@ -814,6 +815,13 @@ static int mtd_ioctl(struct inode *inode +@@ -826,6 +827,13 @@ static int mtd_ioctl(struct file *file, file->f_pos = 0; break; } @@ -570,7 +570,7 @@ ret = -ENOTTY; --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h -@@ -101,6 +101,7 @@ struct mtd_oob_ops { +@@ -98,6 +98,7 @@ struct mtd_oob_ops { uint8_t *oobbuf; }; @@ -578,7 +578,7 @@ struct mtd_info { u_char type; uint32_t flags; -@@ -241,6 +242,9 @@ struct mtd_info { +@@ -238,6 +239,9 @@ struct mtd_info { struct device dev; int usecount; |