Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 291945
b: refs/heads/master
c: 5e8afa3
h: refs/heads/master
i:
  291943: c1d3f58
v: v3
  • Loading branch information
Uwe Kleine-König authored and Grant Likely committed Mar 9, 2012
1 parent 4d619d9 commit 58c8354
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: eb4af0f5349235df2e4a5057a72fc8962d00308a
refs/heads/master: 5e8afa34cc4ab2cea3472b80317a929b83b3c65b
11 changes: 5 additions & 6 deletions trunk/drivers/spi/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ config SPI_COLDFIRE_QSPI

config SPI_DAVINCI
tristate "Texas Instruments DaVinci/DA8x/OMAP-L/AM1x SoC SPI controller"
depends on SPI_MASTER && ARCH_DAVINCI
depends on ARCH_DAVINCI
select SPI_BITBANG
help
SPI master controller for DaVinci/DA8x/OMAP-L/AM1x SPI modules.
Expand Down Expand Up @@ -188,7 +188,7 @@ config SPI_MPC52xx_PSC

config SPI_MPC512x_PSC
tristate "Freescale MPC512x PSC SPI controller"
depends on SPI_MASTER && PPC_MPC512x
depends on PPC_MPC512x
help
This enables using the Freescale MPC5121 Programmable Serial
Controller in SPI master mode.
Expand Down Expand Up @@ -238,7 +238,7 @@ config SPI_OMAP24XX

config SPI_OMAP_100K
tristate "OMAP SPI 100K"
depends on SPI_MASTER && (ARCH_OMAP850 || ARCH_OMAP730)
depends on ARCH_OMAP850 || ARCH_OMAP730
help
OMAP SPI 100K master controller for omap7xx boards.

Expand All @@ -262,7 +262,7 @@ config SPI_PL022

config SPI_PPC4xx
tristate "PPC4xx SPI Controller"
depends on PPC32 && 4xx && SPI_MASTER
depends on PPC32 && 4xx
select SPI_BITBANG
help
This selects a driver for the PPC4xx SPI Controller.
Expand Down Expand Up @@ -338,7 +338,7 @@ config SPI_SH_HSPI

config SPI_STMP3XXX
tristate "Freescale STMP37xx/378x SPI/SSP controller"
depends on ARCH_STMP3XXX && SPI_MASTER
depends on ARCH_STMP3XXX
help
SPI driver for Freescale STMP37xx/378x SoC SSP interface

Expand Down Expand Up @@ -396,7 +396,6 @@ config SPI_NUC900

config SPI_DESIGNWARE
tristate "DesignWare SPI controller core support"
depends on SPI_MASTER
help
general driver for SPI controller core from DesignWare

Expand Down

0 comments on commit 58c8354

Please sign in to comment.