The patch titled CRIS: remove MTD_AMSTD and MTD_OBSOLETE_CHIPS take two has been removed from the -mm tree. Its filename was cris-remove-mtd_amstd-and-mtd_obsolete_chips-take-two.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: CRIS: remove MTD_AMSTD and MTD_OBSOLETE_CHIPS take two From: Jesper Nilsson <jesper.nilsson@xxxxxxxx> Remove MTD_AMDSTD and MTD_OBSOLETE_CHIPS from defconfig, Kconfig and code, instead we'll use MTD_CFI or MTD_JEDECPROBE. [akpm@xxxxxxxxxxxxxxxxxxxx: codingl-style cleanups] Signed-off-by: Jesper Nilsson <jesper.nilsson@xxxxxxxx> Cc: Mikael Starvik <starvik@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/cris/arch-v10/defconfig | 2 -- arch/cris/arch-v10/drivers/Kconfig | 2 -- arch/cris/arch-v10/drivers/axisflashmap.c | 8 ++++---- arch/cris/arch-v32/drivers/Kconfig | 2 -- arch/cris/arch-v32/drivers/axisflashmap.c | 9 ++++----- arch/cris/defconfig | 2 -- 6 files changed, 8 insertions(+), 17 deletions(-) diff -puN arch/cris/arch-v10/defconfig~cris-remove-mtd_amstd-and-mtd_obsolete_chips-take-two arch/cris/arch-v10/defconfig --- a/arch/cris/arch-v10/defconfig~cris-remove-mtd_amstd-and-mtd_obsolete_chips-take-two +++ a/arch/cris/arch-v10/defconfig @@ -99,7 +99,6 @@ CONFIG_MTD=y CONFIG_MTD_CFI=y # CONFIG_MTD_CFI_INTELEXT is not set CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_AMDSTD=y CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y CONFIG_ETRAX_I2C=y @@ -145,7 +144,6 @@ CONFIG_MTD_CFI=y # CONFIG_MTD_CFI_GEOMETRY is not set # CONFIG_MTD_CFI_INTELEXT is not set CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_AMDSTD=y # CONFIG_MTD_SHARP is not set # CONFIG_MTD_PHYSMAP is not set # CONFIG_MTD_NORA is not set diff -puN arch/cris/arch-v10/drivers/Kconfig~cris-remove-mtd_amstd-and-mtd_obsolete_chips-take-two arch/cris/arch-v10/drivers/Kconfig --- a/arch/cris/arch-v10/drivers/Kconfig~cris-remove-mtd_amstd-and-mtd_obsolete_chips-take-two +++ a/arch/cris/arch-v10/drivers/Kconfig @@ -606,8 +606,6 @@ config ETRAX_AXISFLASHMAP select MTD select MTD_CFI select MTD_CFI_AMDSTD - select MTD_OBSOLETE_CHIPS - select MTD_AMDSTD select MTD_CHAR select MTD_BLOCK select MTD_PARTITIONS diff -puN arch/cris/arch-v10/drivers/axisflashmap.c~cris-remove-mtd_amstd-and-mtd_obsolete_chips-take-two arch/cris/arch-v10/drivers/axisflashmap.c --- a/arch/cris/arch-v10/drivers/axisflashmap.c~cris-remove-mtd_amstd-and-mtd_obsolete_chips-take-two +++ a/arch/cris/arch-v10/drivers/axisflashmap.c @@ -312,12 +312,12 @@ static struct mtd_info *probe_cs(struct "%s: Probing a 0x%08lx bytes large window at 0x%08lx.\n", map_cs->name, map_cs->size, map_cs->map_priv_1); -#ifdef CONFIG_MTD_AMDSTD - mtd_cs = do_map_probe("amd_flash", map_cs); -#endif #ifdef CONFIG_MTD_CFI + mtd_cs = do_map_probe("cfi_probe", map_cs); +#endif +#ifdef CONFIG_MTD_JEDECPROBE if (!mtd_cs) { - mtd_cs = do_map_probe("cfi_probe", map_cs); + mtd_cs = do_map_probe("jedec_probe", map_cs); } #endif diff -puN arch/cris/arch-v32/drivers/Kconfig~cris-remove-mtd_amstd-and-mtd_obsolete_chips-take-two arch/cris/arch-v32/drivers/Kconfig --- a/arch/cris/arch-v32/drivers/Kconfig~cris-remove-mtd_amstd-and-mtd_obsolete_chips-take-two +++ a/arch/cris/arch-v32/drivers/Kconfig @@ -362,8 +362,6 @@ config ETRAX_AXISFLASHMAP select MTD select MTD_CFI select MTD_CFI_AMDSTD - select MTD_OBSOLETE_CHIPS - select MTD_AMDSTD select MTD_CHAR select MTD_BLOCK select MTD_PARTITIONS diff -puN arch/cris/arch-v32/drivers/axisflashmap.c~cris-remove-mtd_amstd-and-mtd_obsolete_chips-take-two arch/cris/arch-v32/drivers/axisflashmap.c --- a/arch/cris/arch-v32/drivers/axisflashmap.c~cris-remove-mtd_amstd-and-mtd_obsolete_chips-take-two +++ a/arch/cris/arch-v32/drivers/axisflashmap.c @@ -190,13 +190,12 @@ static struct mtd_info *probe_cs(struct "%s: Probing a 0x%08lx bytes large window at 0x%08lx.\n", map_cs->name, map_cs->size, map_cs->map_priv_1); -#ifdef CONFIG_MTD_AMDSTD - mtd_cs = do_map_probe("amd_flash", map_cs); -#endif #ifdef CONFIG_MTD_CFI - if (!mtd_cs) { mtd_cs = do_map_probe("cfi_probe", map_cs); - } +#endif +#ifdef CONFIG_MTD_JEDECPROBE + if (!mtd_cs) + mtd_cs = do_map_probe("jedec_probe", map_cs); #endif return mtd_cs; diff -puN arch/cris/defconfig~cris-remove-mtd_amstd-and-mtd_obsolete_chips-take-two arch/cris/defconfig --- a/arch/cris/defconfig~cris-remove-mtd_amstd-and-mtd_obsolete_chips-take-two +++ a/arch/cris/defconfig @@ -226,8 +226,6 @@ CONFIG_MTD_CFI_UTIL=y CONFIG_MTD_RAM=y # CONFIG_MTD_ROM is not set # CONFIG_MTD_ABSENT is not set -CONFIG_MTD_OBSOLETE_CHIPS=y -CONFIG_MTD_AMDSTD=y # CONFIG_MTD_SHARP is not set # CONFIG_MTD_JEDEC is not set _ Patches currently in -mm which might be from jesper.nilsson@xxxxxxxx are origin.patch cris-build-fixes-atomich-needs-compilerh.patch git-mtd.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html