Changeset 13343


Ignore:
Timestamp:
2008-11-24T22:52:10+01:00 (8 years ago)
Author:
florian
Message:

Fix this nasty patch which prevented others from applying

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/ar7/patches-2.6.26/110-flash.patch

    r13135 r13343  
    1414  
    1515 config MTD_CHAR 
    16 --- a/drivers/mtd/Makefile 
    17 +++ b/drivers/mtd/Makefile 
    18 @@ -13,6 +13,7 @@ obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdli 
    19  obj-$(CONFIG_MTD_AFS_PARTS)    += afs.o 
    20  obj-$(CONFIG_MTD_AR7_PARTS)    += ar7part.o 
    21  obj-$(CONFIG_MTD_OF_PARTS)      += ofpart.o 
    22 +obj-$(CONFIG_MTD_AR7_PARTS)    += ar7part.o 
    23   
    24  # 'Users' - code which presents functionality to userspace. 
    25  obj-$(CONFIG_MTD_CHAR)         += mtdchar.o 
    2616--- a/drivers/mtd/maps/physmap.c 
    2717+++ b/drivers/mtd/maps/physmap.c 
    28 @@ -87,7 +87,8 @@ static int physmap_flash_remove(struct p 
     18@@ -87,7 +87,7 @@ 
    2919  
    3020 static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL }; 
    3121 #ifdef CONFIG_MTD_PARTITIONS 
    3222-static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL }; 
    33 +static const char *part_probe_types[] = {"cmdlinepart", "RedBoot", 
    34 +                                       "ar7part", NULL }; 
     23+static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", "ar7part", NULL }; 
    3524 #endif 
    3625  
Note: See TracChangeset for help on using the changeset viewer.