do not override CONFIG_CONFIGFS_FS in a few places, and make gpiommc be selectable with the spio-gpio-old module (#4659)
SVN-Revision: 15215
This commit is contained in:
parent
3a35703faa
commit
4bd65101ad
4 changed files with 1 additions and 4 deletions
|
@ -21,7 +21,6 @@ CONFIG_CEVT_R4K=y
|
|||
CONFIG_CFE=y
|
||||
CONFIG_CLASSIC_RCU=y
|
||||
CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 init=/etc/preinit noinitrd console=ttyS0,115200"
|
||||
# CONFIG_CONFIGFS_FS is not set
|
||||
# CONFIG_CPU_BIG_ENDIAN is not set
|
||||
CONFIG_CPU_HAS_LLSC=y
|
||||
CONFIG_CPU_HAS_PREFETCH=y
|
||||
|
|
|
@ -21,7 +21,6 @@ CONFIG_CEVT_R4K=y
|
|||
CONFIG_CFE=y
|
||||
CONFIG_CLASSIC_RCU=y
|
||||
CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 init=/etc/preinit noinitrd console=ttyS0,115200"
|
||||
# CONFIG_CONFIGFS_FS is not set
|
||||
# CONFIG_CPU_BIG_ENDIAN is not set
|
||||
CONFIG_CPU_HAS_LLSC=y
|
||||
CONFIG_CPU_HAS_PREFETCH=y
|
||||
|
|
|
@ -28,7 +28,6 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
|
|||
CONFIG_CEVT_R4K=y
|
||||
CONFIG_CLASSIC_RCU=y
|
||||
CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 init=/etc/preinit noinitrd console=ttyS0,115200"
|
||||
# CONFIG_CONFIGFS_FS is not set
|
||||
CONFIG_CPU_BIG_ENDIAN=y
|
||||
CONFIG_CPU_HAS_LLSC=y
|
||||
CONFIG_CPU_HAS_PREFETCH=y
|
||||
|
|
|
@ -618,7 +618,7 @@
|
|||
+
|
||||
+config GPIOMMC
|
||||
+ tristate "MMC/SD over GPIO-based SPI"
|
||||
+ depends on MMC && MMC_SPI && SPI_GPIO
|
||||
+ depends on MMC && MMC_SPI && (SPI_GPIO || SPI_GPIO_OLD)
|
||||
+ help
|
||||
+ This driver hooks up the mmc_spi and spi_gpio modules so that
|
||||
+ MMC/SD cards can be used on a GPIO based bus by bitbanging
|
||||
|
|
Loading…
Reference in a new issue