diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
| commit | 4de3a8e101150feaefa1139611a50ff37467f33e (patch) | |
| tree | daada742542518b02d7db7c5d32e715eaa5f166d /arch/blackfin/mach-bf533/boards/blackstamp.c | |
| parent | 294064f58953f9964e5945424b09c51800330a83 (diff) | |
| parent | 099469502f62fbe0d7e4f0b83a2f22538367f734 (diff) | |
Merge branch 'master' into fixes
Diffstat (limited to 'arch/blackfin/mach-bf533/boards/blackstamp.c')
| -rw-r--r-- | arch/blackfin/mach-bf533/boards/blackstamp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/mach-bf533/boards/blackstamp.c b/arch/blackfin/mach-bf533/boards/blackstamp.c index 18817d57c7a1..de44a3765e59 100644 --- a/arch/blackfin/mach-bf533/boards/blackstamp.c +++ b/arch/blackfin/mach-bf533/boards/blackstamp.c | |||
| @@ -146,7 +146,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
| 146 | #endif | 146 | #endif |
| 147 | }; | 147 | }; |
| 148 | 148 | ||
| 149 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 149 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
| 150 | /* SPI (0) */ | 150 | /* SPI (0) */ |
| 151 | static struct resource bfin_spi0_resource[] = { | 151 | static struct resource bfin_spi0_resource[] = { |
| 152 | [0] = { | 152 | [0] = { |
| @@ -422,7 +422,7 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
| 422 | #endif | 422 | #endif |
| 423 | 423 | ||
| 424 | 424 | ||
| 425 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 425 | #if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) |
| 426 | &bfin_spi0_device, | 426 | &bfin_spi0_device, |
| 427 | #endif | 427 | #endif |
| 428 | 428 | ||