Changeset 25790


Ignore:
Timestamp:
2011-02-28T16:32:45+01:00 (7 years ago)
Author:
mb
Message:

mtd: Fix compile warning

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic/patches-2.6.38/065-rootfs_split.patch

    r25057 r25790  
    1 --- a/drivers/mtd/Kconfig 
    2 +++ b/drivers/mtd/Kconfig 
     1Index: linux-2.6.38-rc6/drivers/mtd/Kconfig 
     2=================================================================== 
     3--- linux-2.6.38-rc6.orig/drivers/mtd/Kconfig   2011-02-28 16:14:12.668466637 +0100 
     4+++ linux-2.6.38-rc6/drivers/mtd/Kconfig        2011-02-28 16:26:55.463734599 +0100 
    35@@ -55,6 +55,16 @@ config MTD_PARTITIONS 
    46  
     
    1820        tristate "RedBoot partition table parsing" 
    1921        ---help--- 
    20 --- a/drivers/mtd/mtdpart.c 
    21 +++ b/drivers/mtd/mtdpart.c 
     22Index: linux-2.6.38-rc6/drivers/mtd/mtdpart.c 
     23=================================================================== 
     24--- linux-2.6.38-rc6.orig/drivers/mtd/mtdpart.c 2011-02-28 16:14:12.686466221 +0100 
     25+++ linux-2.6.38-rc6/drivers/mtd/mtdpart.c      2011-02-28 16:28:41.399156164 +0100 
    2226@@ -29,6 +29,8 @@ 
    2327 #include <linux/kmod.h> 
     
    192196  * This function, given a master MTD object and a partition table, creates 
    193197  * and registers slave MTD objects which are bound to the master according to 
    194 @@ -651,7 +800,7 @@ int add_mtd_partitions(struct mtd_info * 
    195  { 
     198@@ -652,6 +801,9 @@ int add_mtd_partitions(struct mtd_info * 
    196199        struct mtd_part *slave; 
    197200        uint64_t cur_offset = 0; 
    198 -       int i; 
    199 +       int i, ret; 
     201        int i; 
     202+#ifdef CONFIG_MTD_ROOTFS_SPLIT 
     203+       int ret; 
     204+#endif 
    200205  
    201206        printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name); 
    202207  
    203 @@ -666,6 +815,21 @@ int add_mtd_partitions(struct mtd_info * 
     208@@ -666,6 +818,21 @@ int add_mtd_partitions(struct mtd_info * 
    204209  
    205210                add_mtd_device(&slave->mtd); 
     
    223228        } 
    224229  
    225 @@ -673,6 +837,32 @@ int add_mtd_partitions(struct mtd_info * 
     230@@ -673,6 +840,32 @@ int add_mtd_partitions(struct mtd_info * 
    226231 } 
    227232 EXPORT_SYMBOL(add_mtd_partitions); 
     
    256261 static LIST_HEAD(part_parsers); 
    257262  
    258 --- a/drivers/mtd/devices/block2mtd.c 
    259 +++ b/drivers/mtd/devices/block2mtd.c 
     263Index: linux-2.6.38-rc6/drivers/mtd/devices/block2mtd.c 
     264=================================================================== 
     265--- linux-2.6.38-rc6.orig/drivers/mtd/devices/block2mtd.c       2011-02-28 16:15:07.477184360 +0100 
     266+++ linux-2.6.38-rc6/drivers/mtd/devices/block2mtd.c    2011-02-28 16:26:55.919727057 +0100 
    260267@@ -30,6 +30,8 @@ struct block2mtd_dev { 
    261268        struct block_device *blkdev; 
     
    546553        part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL); 
    547554        part->name = dev->mtd.name; 
    548 --- a/drivers/mtd/mtdchar.c 
    549 +++ b/drivers/mtd/mtdchar.c 
     555Index: linux-2.6.38-rc6/drivers/mtd/mtdchar.c 
     556=================================================================== 
     557--- linux-2.6.38-rc6.orig/drivers/mtd/mtdchar.c 2011-02-28 16:14:12.652467007 +0100 
     558+++ linux-2.6.38-rc6/drivers/mtd/mtdchar.c      2011-02-28 16:15:07.503183744 +0100 
    550559@@ -841,6 +841,13 @@ static int mtd_ioctl(struct file *file, 
    551560                file->f_pos = 0; 
     
    562571        case OTPGETREGIONCOUNT: 
    563572        case OTPGETREGIONINFO: 
    564 --- a/include/linux/mtd/mtd.h 
    565 +++ b/include/linux/mtd/mtd.h 
     573Index: linux-2.6.38-rc6/include/linux/mtd/mtd.h 
     574=================================================================== 
     575--- linux-2.6.38-rc6.orig/include/linux/mtd/mtd.h       2011-02-28 16:14:12.613467908 +0100 
     576+++ linux-2.6.38-rc6/include/linux/mtd/mtd.h    2011-02-28 16:26:51.223804561 +0100 
    566577@@ -125,6 +125,7 @@ struct nand_ecclayout { 
    567578        struct nand_oobfree oobfree[MTD_MAX_OOBFREE_ENTRIES_LARGE]; 
     
    582593         * its own reference counting. The below functions are only for driver. 
    583594         * The driver may register its callbacks. These callbacks are not 
    584 --- a/include/linux/mtd/partitions.h 
    585 +++ b/include/linux/mtd/partitions.h 
     595Index: linux-2.6.38-rc6/include/linux/mtd/partitions.h 
     596=================================================================== 
     597--- linux-2.6.38-rc6.orig/include/linux/mtd/partitions.h        2011-02-28 16:14:12.635467400 +0100 
     598+++ linux-2.6.38-rc6/include/linux/mtd/partitions.h     2011-02-28 16:26:55.382735938 +0100 
    586599@@ -34,12 +34,14 @@ 
    587600  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK). 
     
    607620 /* 
    608621  * Functions dealing with the various ways of partitioning the space 
    609 --- a/include/mtd/mtd-abi.h 
    610 +++ b/include/mtd/mtd-abi.h 
     622Index: linux-2.6.38-rc6/include/mtd/mtd-abi.h 
     623=================================================================== 
     624--- linux-2.6.38-rc6.orig/include/mtd/mtd-abi.h 2011-02-28 16:14:12.596468301 +0100 
     625+++ linux-2.6.38-rc6/include/mtd/mtd-abi.h      2011-02-28 16:15:07.505183696 +0100 
    611626@@ -127,6 +127,7 @@ struct otp_info { 
    612627 #define MEMWRITEOOB64          _IOWR('M', 21, struct mtd_oob_buf64) 
Note: See TracChangeset for help on using the changeset viewer.