diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2016-12-13 22:37:02 -0500 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-12-13 22:37:02 -0500 |
| commit | 57fb7ee10c27b315600445b2bad72236a11951ad (patch) | |
| tree | 9cecbaf35c9fd7f11808bb3f028d60165e2079db /include/linux/platform_data | |
| parent | 90644ad7f2c0292b1a2a98d733bd17f449bb9885 (diff) | |
| parent | c41668ad5de939855636650d39e961893dc5d6fc (diff) | |
Merge branch 'topic/s3c64xx' into for-linus
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/spi-s3c64xx.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/platform_data/spi-s3c64xx.h b/include/linux/platform_data/spi-s3c64xx.h index 5c1e21c87270..da79774078a7 100644 --- a/include/linux/platform_data/spi-s3c64xx.h +++ b/include/linux/platform_data/spi-s3c64xx.h | |||
| @@ -40,9 +40,6 @@ struct s3c64xx_spi_info { | |||
| 40 | int num_cs; | 40 | int num_cs; |
| 41 | bool no_cs; | 41 | bool no_cs; |
| 42 | int (*cfg_gpio)(void); | 42 | int (*cfg_gpio)(void); |
| 43 | dma_filter_fn filter; | ||
| 44 | void *dma_tx; | ||
| 45 | void *dma_rx; | ||
| 46 | }; | 43 | }; |
| 47 | 44 | ||
| 48 | /** | 45 | /** |