diff options
| author | Mark Brown <broonie@kernel.org> | 2019-03-04 18:32:51 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-03-04 18:32:51 +0300 |
| commit | 14dbfb417bd80c96ec700c7a8414bb6f5db7ecd2 (patch) | |
| tree | f79fb71b6206ef40aa34c52649053a2aaa493a3c /arch/arm/mach-pxa/magician.c | |
| parent | b50c6ac8b6fb3e7b5cf843afd789c8553a910254 (diff) | |
| parent | 0e836c3bea7da04cd4e2ed22d8c20654d5a09273 (diff) | |
| download | linux-14dbfb417bd80c96ec700c7a8414bb6f5db7ecd2.tar.xz | |
Merge branch 'spi-5.1' into spi-next
Diffstat (limited to 'arch/arm/mach-pxa/magician.c')
| -rw-r--r-- | arch/arm/mach-pxa/magician.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c index 08b079653c3f..618bcff4cdc9 100644 --- a/arch/arm/mach-pxa/magician.c +++ b/arch/arm/mach-pxa/magician.c @@ -932,7 +932,7 @@ struct pxa2xx_spi_chip tsc2046_chip_info = { .gpio_cs = GPIO14_MAGICIAN_TSC2046_CS, }; -static struct pxa2xx_spi_master magician_spi_info = { +static struct pxa2xx_spi_controller magician_spi_info = { .num_chipselect = 1, .enable_dma = 1, }; |