From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Jun 2013 00:50:31 +0000 (+1000)
Subject: Merge remote-tracking branch 'm68k/for-next'
X-Git-Tag: next-20130619~107
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=90b337a6f2799aee047bdc4f7b668c2eb46369f5;p=karo-tx-linux.git

Merge remote-tracking branch 'm68k/for-next'

Conflicts:
	arch/cris/arch-v32/drivers/Kconfig
---

90b337a6f2799aee047bdc4f7b668c2eb46369f5
diff --cc arch/cris/arch-v32/drivers/Kconfig
index c1e21fc1b43d,f64779c1fb3c..8ac05594ecc6
--- a/arch/cris/arch-v32/drivers/Kconfig
+++ b/arch/cris/arch-v32/drivers/Kconfig
@@@ -440,9 -785,51 +438,4 @@@ config ETRAX_SPI_GPI
  	  Say m to build it as a module, which will be called spi_crisv32_gpio.
  	  (You need to select MMC separately.)
  
- # Avoid choices causing non-working configs by conditionalizing the inclusion.
- if ETRAX_SPI_MMC
- source drivers/spi/Kconfig
- endif
 -# The default match that of sser0, only because that's how it was tested.
 -config ETRAX_SPI_CS_PIN
 -	string "SPI chip select pin"
 -	depends on ETRAX_SPI_GPIO
 -	default "pc3"
 -	help
 -	  The pin to use for SPI chip select.
 -
 -config ETRAX_SPI_CLK_PIN
 -	string "SPI clock pin"
 -	depends on ETRAX_SPI_GPIO
 -	default "pc1"
 -	help
 -	  The pin to use for the SPI clock.
 -
 -config ETRAX_SPI_DATAIN_PIN
 -	string "SPI MISO (data in) pin"
 -	depends on ETRAX_SPI_GPIO
 -	default "pc16"
 -	help
 -	  The pin to use for SPI data in from the device.
 -
 -config ETRAX_SPI_DATAOUT_PIN
 -	string "SPI MOSI (data out) pin"
 -	depends on ETRAX_SPI_GPIO
 -	default "pc0"
 -	help
 -	  The pin to use for SPI data out to the device.
 -
 -config ETRAX_SPI_MMC_CD_GPIO_PIN
 -	string "MMC/SD card detect pin for SPI using gpio (space for none)"
 -	depends on ETRAX_SPI_GPIO && MMC_SPI
 -	default "pd11"
 -	help
 -	  The pin to use for SD/MMC card detect.  This pin should be pulled up
 -	  and grounded when a card is present.  If defined as " " (space), no
 -	  pin is selected.  A card must then always be inserted for proper
 -	  action.
 -
 -config ETRAX_SPI_MMC_WP_GPIO_PIN
 -	string "MMC/SD card write-protect pin for SPI using gpio (space for none)"
 -	depends on ETRAX_SPI_GPIO && MMC_SPI
 -	default "pd10"
 -	help
 -	  The pin to use for the SD/MMC write-protect signal for a memory
 -	  card.  If defined as " " (space), the card is considered writable.
--
  endif