diff options
| author |   Mark Brown <broonie@kernel.org> | 2019-03-04 15:32:51 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-03-04 15:32:51 +0000 |
| commit | 14dbfb417bd80c96ec700c7a8414bb6f5db7ecd2 (patch) | |
| tree | f79fb71b6206ef40aa34c52649053a2aaa493a3c /arch/arm/mach-pxa/cm-x270.c | |
| parent | Merge branch 'spi-5.0' into spi-linus (diff) | |
| parent | spi: sh-msiof: Restrict bits per word to 8/16/24/32 on R-Car Gen2/3 (diff) | |
| download | linux-dev-14dbfb417bd80c96ec700c7a8414bb6f5db7ecd2.tar.xz linux-dev-14dbfb417bd80c96ec700c7a8414bb6f5db7ecd2.zip | |
Merge branch 'spi-5.1' into spi-next
Diffstat (limited to 'arch/arm/mach-pxa/cm-x270.c')
| -rw-r--r-- | arch/arm/mach-pxa/cm-x270.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c index f7081a50dc67..279eeca7add0 100644 --- a/arch/arm/mach-pxa/cm-x270.c +++ b/arch/arm/mach-pxa/cm-x270.c @@ -313,7 +313,7 @@ static inline void cmx270_init_mmc(void) {} #endif #if defined(CONFIG_SPI_PXA2XX) || defined(CONFIG_SPI_PXA2XX_MODULE) -static struct pxa2xx_spi_master cm_x270_spi_info = { +static struct pxa2xx_spi_controller cm_x270_spi_info = { .num_chipselect = 1, .enable_dma = 1, }; |