Hi Geert,
Today's linux-next merge of the m68k tree got a conflict in
arch/cris/arch-v32/drivers/Kconfig between commit aca30fdc0fb6 ("CRIS:
drop unused Kconfig symbols") from the cris tree and commit 6b8faf979bca
("cris: Switch cris to drivers/Kconfig") from the m68k tree.
Thanks for the heads up Geert. I fixed it up (see below) and can carry
the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc arch/cris/arch-v32/drivers/Kconfig
index c1e21fc,f64779c..0000000
--- 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
Attachment:
pgp452ufTEvxm.pgp
Description: PGP signature
