projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
blackfin
/
mach-bf561
/
boards
/
acvilon.c
diff --git
a/arch/blackfin/mach-bf561/boards/acvilon.c
b/arch/blackfin/mach-bf561/boards/acvilon.c
index b1b7339b6ba776a321d0614c091fe035508d63b7..f6ffd6f054c398201dfea4e21aaf4c3b6d044719 100644
(file)
--- a/
arch/blackfin/mach-bf561/boards/acvilon.c
+++ b/
arch/blackfin/mach-bf561/boards/acvilon.c
@@
-372,7
+372,7
@@
static struct bfin5xx_spi_chip data_flash_chip_info = {
};
#endif
};
#endif
-#if defined(CONFIG_SPI_BFIN
) || defined(CONFIG_SPI_BFIN
_MODULE)
+#if defined(CONFIG_SPI_BFIN
5XX) || defined(CONFIG_SPI_BFIN5XX
_MODULE)
/* SPI (0) */
static struct resource bfin_spi0_resource[] = {
[0] = {
/* SPI (0) */
static struct resource bfin_spi0_resource[] = {
[0] = {
@@
-475,7
+475,7
@@
static struct platform_device bfin_dpmc = {
static struct platform_device *acvilon_devices[] __initdata = {
&bfin_dpmc,
static struct platform_device *acvilon_devices[] __initdata = {
&bfin_dpmc,
-#if defined(CONFIG_SPI_BFIN
) || defined(CONFIG_SPI_BFIN
_MODULE)
+#if defined(CONFIG_SPI_BFIN
5XX) || defined(CONFIG_SPI_BFIN5XX
_MODULE)
&bfin_spi0_device,
#endif
&bfin_spi0_device,
#endif