diff --git a/[refs] b/[refs] index 36c128055752..9476b11db610 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b73b255956119111dc18fa063d1e3a0bb3f06328 +refs/heads/master: f33b29ee3309ba2cd56ade8e905b3640a7dea909 diff --git a/trunk/drivers/spi/Kconfig b/trunk/drivers/spi/Kconfig index 3ac072f6db35..927a8b77e604 100644 --- a/trunk/drivers/spi/Kconfig +++ b/trunk/drivers/spi/Kconfig @@ -166,6 +166,9 @@ config SPI_PL022 tristate "ARM AMBA PL022 SSP controller (EXPERIMENTAL)" depends on ARM_AMBA && EXPERIMENTAL default y if MACH_U300 + default y if ARCH_REALVIEW + default y if INTEGRATOR_IMPD1 + default y if ARCH_VERSATILE help This selects the ARM(R) AMBA(R) PrimeCell PL022 SSP controller. If you have an embedded system with an AMBA(R)