diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2016-10-03 06:46:03 +0300 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-10-03 06:46:03 +0300 |
| commit | 6619f035a64dd44c7238b7341c138a3975d59111 (patch) | |
| tree | fce47632273afaa50960abb2c60a04bf63e44783 /include/linux | |
| parent | 02aa84860c29f3f5a57e959982c811df46a2736c (diff) | |
| parent | 509cf0b8146c73e6f29bcf732d1af1b1aed5ec01 (diff) | |
| download | linux-6619f035a64dd44c7238b7341c138a3975d59111.tar.xz | |
Merge branch 'topic/compile_test' into for-linus
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/omap-dma.h | 19 | ||||
| -rw-r--r-- | include/linux/platform_data/dma-mmp_tdma.h | 2 |
2 files changed, 20 insertions, 1 deletions
diff --git a/include/linux/omap-dma.h b/include/linux/omap-dma.h index 1d99b61adc65..290081620b3e 100644 --- a/include/linux/omap-dma.h +++ b/include/linux/omap-dma.h @@ -297,6 +297,7 @@ struct omap_system_dma_plat_info { #define dma_omap15xx() __dma_omap15xx(d) #define dma_omap16xx() __dma_omap16xx(d) +#if defined(CONFIG_ARCH_OMAP) extern struct omap_system_dma_plat_info *omap_get_plat_info(void); extern void omap_set_dma_priority(int lch, int dst_port, int priority); @@ -355,4 +356,22 @@ static inline int omap_lcd_dma_running(void) } #endif +#else /* CONFIG_ARCH_OMAP */ + +static inline struct omap_system_dma_plat_info *omap_get_plat_info(void) +{ + return NULL; +} + +static inline int omap_request_dma(int dev_id, const char *dev_name, + void (*callback)(int lch, u16 ch_status, void *data), + void *data, int *dma_ch) +{ + return -ENODEV; +} + +static inline void omap_free_dma(int ch) { } + +#endif /* CONFIG_ARCH_OMAP */ + #endif /* __LINUX_OMAP_DMA_H */ diff --git a/include/linux/platform_data/dma-mmp_tdma.h b/include/linux/platform_data/dma-mmp_tdma.h index 0c72886030ef..422d4504dbac 100644 --- a/include/linux/platform_data/dma-mmp_tdma.h +++ b/include/linux/platform_data/dma-mmp_tdma.h @@ -28,7 +28,7 @@ struct sram_platdata { int granularity; }; -#ifdef CONFIG_ARM +#ifdef CONFIG_MMP_SRAM extern struct gen_pool *sram_get_gpool(char *pool_name); #else static inline struct gen_pool *sram_get_gpool(char *pool_name) |