From 5086844993ccabed43ae1a2abc9a996a818a1baa Mon Sep 17 00:00:00 2001 From: Scott Jiang Date: Mon, 23 Apr 2012 18:18:08 -0400 Subject: [PATCH] --- yaml --- r: 299757 b: refs/heads/master c: 22ac3e82e1d3e5cad92538fe4ab51906cb220444 h: refs/heads/master i: 299755: c7755bf07e66ef56ca88a08415954b4c4c900588 v: v3 --- [refs] | 2 +- trunk/drivers/spi/Kconfig | 2 +- trunk/drivers/spi/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0f3daff1beae..aeb960f90d25 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea505bc99f77f3f9db02bb965bd59ac5db063f60 +refs/heads/master: 22ac3e82e1d3e5cad92538fe4ab51906cb220444 diff --git a/trunk/drivers/spi/Kconfig b/trunk/drivers/spi/Kconfig index 3ed748355b98..00c024039c97 100644 --- a/trunk/drivers/spi/Kconfig +++ b/trunk/drivers/spi/Kconfig @@ -74,7 +74,7 @@ config SPI_ATMEL This selects a driver for the Atmel SPI Controller, present on many AT32 (AVR32) and AT91 (ARM) chips. -config SPI_BFIN +config SPI_BFIN5XX tristate "SPI controller driver for ADI Blackfin5xx" depends on BLACKFIN help diff --git a/trunk/drivers/spi/Makefile b/trunk/drivers/spi/Makefile index a1d48e0ba3dc..9d75d2198ff5 100644 --- a/trunk/drivers/spi/Makefile +++ b/trunk/drivers/spi/Makefile @@ -15,7 +15,7 @@ obj-$(CONFIG_SPI_ATMEL) += spi-atmel.o obj-$(CONFIG_SPI_ATH79) += spi-ath79.o obj-$(CONFIG_SPI_AU1550) += spi-au1550.o obj-$(CONFIG_SPI_BCM63XX) += spi-bcm63xx.o -obj-$(CONFIG_SPI_BFIN) += spi-bfin5xx.o +obj-$(CONFIG_SPI_BFIN5XX) += spi-bfin5xx.o obj-$(CONFIG_SPI_BFIN_SPORT) += spi-bfin-sport.o obj-$(CONFIG_SPI_BITBANG) += spi-bitbang.o obj-$(CONFIG_SPI_BUTTERFLY) += spi-butterfly.o