On Wed, Apr 09, 2014 at 10:32:50AM -0700, Brian Norris wrote: > Signed-off-by: Brian Norris <[email protected]> > --- > drivers/mtd/Makefile | 2 +- > drivers/mtd/devices/Kconfig | 2 +- > drivers/mtd/spi-nor/Kconfig | 11 ++++++++--- > drivers/mtd/spi-nor/Makefile | 2 +- > 4 files changed, 11 insertions(+), 6 deletions(-) > > diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile > index 40fd15344387..99bb9a1f6e16 100644 > --- a/drivers/mtd/Makefile > +++ b/drivers/mtd/Makefile > @@ -32,5 +32,5 @@ inftl-objs := inftlcore.o inftlmount.o > > obj-y += chips/ lpddr/ maps/ devices/ nand/ onenand/ tests/ > > -obj-$(CONFIG_MTD_SPI_NOR_BASE) += spi-nor/ > +obj-$(CONFIG_MTD_SPI_NOR) += spi-nor/ > obj-$(CONFIG_MTD_UBI) += ubi/ > diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig > index 48aa1aa5820b..f9e32b53dfc6 100644 > --- a/drivers/mtd/devices/Kconfig > +++ b/drivers/mtd/devices/Kconfig > @@ -80,7 +80,7 @@ config MTD_DATAFLASH_OTP > > config MTD_M25P80 > tristate "Support most SPI Flash chips (AT26DF, M25P, W25X, ...)" > - depends on SPI_MASTER && MTD_SPI_NOR_BASE > + depends on SPI_MASTER && MTD_SPI_NOR > help > This enables access to most modern SPI flash chips, used for > program and data storage. Series supported include Atmel AT26DF, > diff --git a/drivers/mtd/spi-nor/Kconfig b/drivers/mtd/spi-nor/Kconfig > index 64cfc39ad17e..d682fb440e06 100644 > --- a/drivers/mtd/spi-nor/Kconfig > +++ b/drivers/mtd/spi-nor/Kconfig > @@ -1,12 +1,17 @@ > -config MTD_SPI_NOR_BASE > - bool "the framework for SPI-NOR support" > +config MTD_SPI_NOR > + bool "SPI-NOR device support" > depends on MTD > help > This is the framework for the SPI NOR which can be used by the SPI > device drivers and the SPI-NOR device driver. > + > +if MTD_SPI_NOR > + > config SPI_FSL_QUADSPI > tristate "Freescale Quad SPI controller" > - depends on ARCH_MXC && MTD_SPI_NOR_BASE > + depends on ARCH_MXC > help > This enables support for the Quad SPI controller in master mode. > We only connect the NOR to this controller now. > + > +endif # MTD_SPI_NOR > diff --git a/drivers/mtd/spi-nor/Makefile b/drivers/mtd/spi-nor/Makefile > index 51f9d8b99ab7..6a7ce1462247 100644 > --- a/drivers/mtd/spi-nor/Makefile > +++ b/drivers/mtd/spi-nor/Makefile > @@ -1,2 +1,2 @@ > -obj-$(CONFIG_MTD_SPI_NOR_BASE) += spi-nor.o > +obj-$(CONFIG_MTD_SPI_NOR) += spi-nor.o > obj-$(CONFIG_SPI_FSL_QUADSPI) += fsl-quadspi.o > -- > 1.8.3.2 > > > Acked-by: Huang Shijie <[email protected]>
-- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
