Applied to 3.16. Thanks.
On Thu, May 1, 2014 at 2:26 PM, Brian Norris <computersforpe...@gmail.com> wrote: > These defconfigs contain the CONFIG_M25P80 symbol, which is now > dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy > the new dependency. > > At the same time, drop the now-nonexistent CONFIG_MTD_CHAR symbol. > > Signed-off-by: Brian Norris <computersforpe...@gmail.com> > Cc: Steven Miao <real...@gmail.com> > Cc: adi-buildroot-de...@lists.sourceforge.net > Cc: linux-kernel@vger.kernel.org > --- > arch/blackfin/configs/BF526-EZBRD_defconfig | 2 +- > arch/blackfin/configs/BF527-EZKIT-V2_defconfig | 2 +- > arch/blackfin/configs/BF527-EZKIT_defconfig | 2 +- > arch/blackfin/configs/BF548-EZKIT_defconfig | 2 +- > arch/blackfin/configs/BF609-EZKIT_defconfig | 2 +- > arch/blackfin/configs/BlackStamp_defconfig | 3 +-- > arch/blackfin/configs/H8606_defconfig | 3 +-- > 7 files changed, 7 insertions(+), 9 deletions(-) > > diff --git a/arch/blackfin/configs/BF526-EZBRD_defconfig > b/arch/blackfin/configs/BF526-EZBRD_defconfig > index 2f2c6acf210c..530ba7a6d7b0 100644 > --- a/arch/blackfin/configs/BF526-EZBRD_defconfig > +++ b/arch/blackfin/configs/BF526-EZBRD_defconfig > @@ -53,7 +53,6 @@ CONFIG_IP_PNP=y > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > # CONFIG_FW_LOADER is not set > CONFIG_MTD=y > -CONFIG_MTD_CHAR=y > CONFIG_MTD_BLOCK=y > CONFIG_MTD_CFI=y > CONFIG_MTD_CFI_INTELEXT=y > @@ -63,6 +62,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y > CONFIG_MTD_PHYSMAP=y > CONFIG_MTD_M25P80=y > CONFIG_MTD_NAND=m > +CONFIG_MTD_SPI_NOR=y > CONFIG_BLK_DEV_RAM=y > CONFIG_SCSI=y > # CONFIG_SCSI_PROC_FS is not set > diff --git a/arch/blackfin/configs/BF527-EZKIT-V2_defconfig > b/arch/blackfin/configs/BF527-EZKIT-V2_defconfig > index 91535c38e7f2..a21c79275eae 100644 > --- a/arch/blackfin/configs/BF527-EZKIT-V2_defconfig > +++ b/arch/blackfin/configs/BF527-EZKIT-V2_defconfig > @@ -58,7 +58,6 @@ CONFIG_BFIN_SIR0=y > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > # CONFIG_FW_LOADER is not set > CONFIG_MTD=y > -CONFIG_MTD_CHAR=m > CONFIG_MTD_BLOCK=y > CONFIG_MTD_JEDECPROBE=m > CONFIG_MTD_RAM=y > @@ -66,6 +65,7 @@ CONFIG_MTD_ROM=m > CONFIG_MTD_COMPLEX_MAPPINGS=y > CONFIG_MTD_M25P80=y > CONFIG_MTD_NAND=m > +CONFIG_MTD_SPI_NOR=y > CONFIG_BLK_DEV_RAM=y > CONFIG_SCSI=y > # CONFIG_SCSI_PROC_FS is not set > diff --git a/arch/blackfin/configs/BF527-EZKIT_defconfig > b/arch/blackfin/configs/BF527-EZKIT_defconfig > index af2738c7441b..5070a860d8c4 100644 > --- a/arch/blackfin/configs/BF527-EZKIT_defconfig > +++ b/arch/blackfin/configs/BF527-EZKIT_defconfig > @@ -57,7 +57,6 @@ CONFIG_BFIN_SIR0=y > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > # CONFIG_FW_LOADER is not set > CONFIG_MTD=y > -CONFIG_MTD_CHAR=m > CONFIG_MTD_BLOCK=y > CONFIG_MTD_JEDECPROBE=m > CONFIG_MTD_RAM=y > @@ -65,6 +64,7 @@ CONFIG_MTD_ROM=m > CONFIG_MTD_COMPLEX_MAPPINGS=y > CONFIG_MTD_M25P80=y > CONFIG_MTD_NAND=m > +CONFIG_MTD_SPI_NOR=y > CONFIG_BLK_DEV_RAM=y > CONFIG_SCSI=y > # CONFIG_SCSI_PROC_FS is not set > diff --git a/arch/blackfin/configs/BF548-EZKIT_defconfig > b/arch/blackfin/configs/BF548-EZKIT_defconfig > index e716fdfd2cf2..efb293057287 100644 > --- a/arch/blackfin/configs/BF548-EZKIT_defconfig > +++ b/arch/blackfin/configs/BF548-EZKIT_defconfig > @@ -64,7 +64,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_FW_LOADER=m > CONFIG_MTD=y > CONFIG_MTD_CMDLINE_PARTS=y > -CONFIG_MTD_CHAR=y > CONFIG_MTD_BLOCK=y > CONFIG_MTD_CFI=y > CONFIG_MTD_CFI_INTELEXT=y > @@ -75,6 +74,7 @@ CONFIG_MTD_M25P80=y > CONFIG_MTD_NAND=y > CONFIG_MTD_NAND_BF5XX=y > # CONFIG_MTD_NAND_BF5XX_HWECC is not set > +CONFIG_MTD_SPI_NOR=y > CONFIG_BLK_DEV_RAM=y > # CONFIG_SCSI_PROC_FS is not set > CONFIG_BLK_DEV_SD=y > diff --git a/arch/blackfin/configs/BF609-EZKIT_defconfig > b/arch/blackfin/configs/BF609-EZKIT_defconfig > index 4ca39ab6b2bf..a7e9bfd84183 100644 > --- a/arch/blackfin/configs/BF609-EZKIT_defconfig > +++ b/arch/blackfin/configs/BF609-EZKIT_defconfig > @@ -57,7 +57,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_FW_LOADER=m > CONFIG_MTD=y > CONFIG_MTD_CMDLINE_PARTS=y > -CONFIG_MTD_CHAR=y > CONFIG_MTD_BLOCK=y > CONFIG_MTD_CFI=y > CONFIG_MTD_CFI_INTELEXT=y > @@ -65,6 +64,7 @@ CONFIG_MTD_CFI_STAA=y > CONFIG_MTD_COMPLEX_MAPPINGS=y > CONFIG_MTD_PHYSMAP=y > CONFIG_MTD_M25P80=y > +CONFIG_MTD_SPI_NOR=y > CONFIG_MTD_UBI=m > CONFIG_SCSI=y > CONFIG_BLK_DEV_SD=y > diff --git a/arch/blackfin/configs/BlackStamp_defconfig > b/arch/blackfin/configs/BlackStamp_defconfig > index 3853c473b443..f4a9200e1ab1 100644 > --- a/arch/blackfin/configs/BlackStamp_defconfig > +++ b/arch/blackfin/configs/BlackStamp_defconfig > @@ -45,7 +45,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > # CONFIG_FW_LOADER is not set > CONFIG_MTD=y > CONFIG_MTD_CMDLINE_PARTS=y > -CONFIG_MTD_CHAR=m > CONFIG_MTD_BLOCK=y > CONFIG_MTD_CFI=m > CONFIG_MTD_CFI_AMDSTD=m > @@ -53,7 +52,7 @@ CONFIG_MTD_RAM=y > CONFIG_MTD_ROM=m > CONFIG_MTD_COMPLEX_MAPPINGS=y > CONFIG_MTD_M25P80=y > -# CONFIG_M25PXX_USE_FAST_READ is not set > +CONFIG_MTD_SPI_NOR=y > CONFIG_BLK_DEV_LOOP=y > CONFIG_BLK_DEV_NBD=y > CONFIG_BLK_DEV_RAM=y > diff --git a/arch/blackfin/configs/H8606_defconfig > b/arch/blackfin/configs/H8606_defconfig > index f754e490bbfd..0ff97d8d047a 100644 > --- a/arch/blackfin/configs/H8606_defconfig > +++ b/arch/blackfin/configs/H8606_defconfig > @@ -36,13 +36,12 @@ CONFIG_IRTTY_SIR=m > # CONFIG_WIRELESS is not set > # CONFIG_FW_LOADER is not set > CONFIG_MTD=y > -CONFIG_MTD_CHAR=y > CONFIG_MTD_BLOCK=y > CONFIG_MTD_RAM=y > CONFIG_MTD_ROM=y > CONFIG_MTD_COMPLEX_MAPPINGS=y > CONFIG_MTD_M25P80=y > -# CONFIG_M25PXX_USE_FAST_READ is not set > +CONFIG_MTD_SPI_NOR=y > CONFIG_BLK_DEV_RAM=y > CONFIG_MISC_DEVICES=y > CONFIG_EEPROM_AT25=y > -- > 1.8.3.2 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/