diff options
| author | Tony Lindgren <tony@atomide.com> | 2021-10-06 07:55:44 +0300 | 
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2021-10-06 07:55:44 +0300 | 
| commit | e700ac213a0f793fb4f83098413303e3dd080892 (patch) | |
| tree | 52130e5a24ec9ea55b2f81899b8a45bed0f17f7c /drivers/mtd/maps/Kconfig | |
| parent | e879f855e590b40fe3c79f2fbd8f65ca3c724120 (diff) | |
| parent | b232537074fcaf0c2837abbb217429c097bb7598 (diff) | |
| download | linux-e700ac213a0f793fb4f83098413303e3dd080892.tar.bz2 | |
Merge branch 'pruss-fix' into fixes
Merge in a fix for pruss reset issue caused by enabling pruss for am335x.
Diffstat (limited to 'drivers/mtd/maps/Kconfig')
| -rw-r--r-- | drivers/mtd/maps/Kconfig | 23 | 
1 files changed, 0 insertions, 23 deletions
| diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index 6650acbc961e..aaa164b977fe 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig @@ -127,29 +127,6 @@ config MTD_PHYSMAP_GPIO_ADDR  	  Extend the physmap driver to allow flashes to be partially  	  physically addressed and assisted by GPIOs. -config MTD_PMC_MSP_EVM -	tristate "CFI Flash device mapped on PMC-Sierra MSP" -	depends on PMC_MSP && MTD_CFI -	help -	  This provides a 'mapping' driver which supports the way -	  in which user-programmable flash chips are connected on the -	  PMC-Sierra MSP eval/demo boards. - -choice -	prompt "Maximum mappable memory available for flash IO" -	depends on MTD_PMC_MSP_EVM -	default MSP_FLASH_MAP_LIMIT_32M - -config MSP_FLASH_MAP_LIMIT_32M -	bool "32M" - -endchoice - -config MSP_FLASH_MAP_LIMIT -	hex -	default "0x02000000" -	depends on MSP_FLASH_MAP_LIMIT_32M -  config MTD_SUN_UFLASH  	tristate "Sun Microsystems userflash support"  	depends on SPARC && MTD_CFI && PCI |