Merge tags 'devicetree-for-linus' and 'spi-for-linus' of git://git.secretlab.ca/git...

[mv-sheeva.git] / arch / blackfin / configs / CM-BF561_defconfig

diff --git a/arch/blackfin/configs/CM-BF561_defconfig b/arch/blackfin/configs/CM-BF561_defconfig
index 6c7b21585a43d33032b43ee9421186245122d5df..0456deaa2d6fbc94b62bb7e6a5feb4b815e9a07f 100644 (file)
--- a/arch/blackfin/configs/CM-BF561_defconfig
+++ b/arch/blackfin/configs/CM-BF561_defconfig
@@ -78,7 +78,7 @@ CONFIG_SERIAL_BFIN_CONSOLE=y
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_HW_RANDOM is not set
 CONFIG_SPI=y
-CONFIG_SPI_BFIN=y
+CONFIG_SPI_BFIN5XX=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_USB_GADGET=m