remove CONFIG_MTD_PARTITIONS references from lantiq 3.0 patches

[openwrt.git] / target / linux / generic / patches-2.6.37 / 442-block2mtd_probe.patch

diff --git a/target/linux/generic/patches-2.6.37/442-block2mtd_probe.patch b/target/linux/generic/patches-2.6.37/442-block2mtd_probe.patch
index b9130a4..a97b74e 100644 (file)
--- a/target/linux/generic/patches-2.6.37/442-block2mtd_probe.patch
+++ b/target/linux/generic/patches-2.6.37/442-block2mtd_probe.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/block2mtd.c
 +++ b/drivers/mtd/devices/block2mtd.c
 --- a/drivers/mtd/devices/block2mtd.c
 +++ b/drivers/mtd/devices/block2mtd.c

-@@ -264,10 +264,12 @@ static int _open_bdev(struct block2mtd_d
+@@ -264,11 +264,13 @@ static int _open_bdev(struct block2mtd_d

        bdev = open_bdev_exclusive(dev->devname, FMODE_READ|FMODE_WRITE, NULL);
  #ifndef MODULE
        if (IS_ERR(bdev)) {
        bdev = open_bdev_exclusive(dev->devname, FMODE_READ|FMODE_WRITE, NULL);
  #ifndef MODULE
        if (IS_ERR(bdev)) {


@@ -9,8 +9,9 @@
                /* We might not have rootfs mounted at this point. Try
                   to resolve the device name by other means. */
  
                /* We might not have rootfs mounted at this point. Try
                   to resolve the device name by other means. */
  

-+              wait_for_device_probe();

 -              dev_t devt = name_to_dev_t(dev->devname);
 -              dev_t devt = name_to_dev_t(dev->devname);

++              wait_for_device_probe();

 +              devt = name_to_dev_t(dev->devname);
                if (devt) {
                        bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
 +              devt = name_to_dev_t(dev->devname);
                if (devt) {
                        bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);

+               }