diff options
| author | John Crispin <blogic@openwrt.org> | 2014-06-26 13:47:46 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2014-06-26 13:47:46 +0000 |
| commit | a5a86f528d940531f3a24eb3c1b1e66fac492852 (patch) | |
| tree | 8b2d6f407b83ede3ebd2a3bb4f42970d5e8ea50a /target/linux/generic/patches-3.10/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch | |
| parent | 994485877673c5eafe8626e28a805f6ce91cf609 (diff) | |
| download | upstream-a5a86f528d940531f3a24eb3c1b1e66fac492852.tar.gz upstream-a5a86f528d940531f3a24eb3c1b1e66fac492852.tar.bz2 upstream-a5a86f528d940531f3a24eb3c1b1e66fac492852.zip | |
kernel: refresh generic patches
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41352 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.10/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch')
| -rw-r--r-- | target/linux/generic/patches-3.10/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/generic/patches-3.10/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/patches-3.10/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch index 440c6bf050..b0b367eb77 100644 --- a/target/linux/generic/patches-3.10/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch +++ b/target/linux/generic/patches-3.10/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch @@ -9,11 +9,9 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> drivers/mtd/ubi/build.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) -diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c -index 6e30a3c..999a36b 100644 --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c -@@ -1209,6 +1209,36 @@ static struct mtd_info * __init open_mtd_device(const char *mtd_dev) +@@ -1207,6 +1207,36 @@ static struct mtd_info * __init open_mtd return mtd; } @@ -50,7 +48,7 @@ index 6e30a3c..999a36b 100644 static int __init ubi_init(void) { int err, i, k; -@@ -1298,6 +1328,12 @@ static int __init ubi_init(void) +@@ -1290,6 +1320,12 @@ static int __init ubi_init(void) } } @@ -63,6 +61,3 @@ index 6e30a3c..999a36b 100644 err = ubiblock_init(); if (err) { ubi_err("block: cannot initialize, error %d", err); --- -1.9.2 - |