diff --git a/[refs] b/[refs] index 4f3311093ea2..4ea4104c6db7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a18c266f8e43004c85c56b4077f6158fcadb7707 +refs/heads/master: 7f9a4b9797405061a07fca26ff1b4f305c564e5d diff --git a/trunk/drivers/spi/Kconfig b/trunk/drivers/spi/Kconfig index fc14b8dea0d7..fbd96b29530d 100644 --- a/trunk/drivers/spi/Kconfig +++ b/trunk/drivers/spi/Kconfig @@ -271,8 +271,8 @@ config SPI_ORION This enables using the SPI master controller on the Orion chips. config SPI_PL022 - tristate "ARM AMBA PL022 SSP controller (EXPERIMENTAL)" - depends on ARM_AMBA && EXPERIMENTAL + tristate "ARM AMBA PL022 SSP controller" + depends on ARM_AMBA default y if MACH_U300 default y if ARCH_REALVIEW default y if INTEGRATOR_IMPD1