diff options
| author |   Vinod Koul <vinod.koul@intel.com> | 2016-10-03 09:16:03 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-10-03 09:16:03 +0530 |
| commit | 6619f035a64dd44c7238b7341c138a3975d59111 (patch) | |
| tree | fce47632273afaa50960abb2c60a04bf63e44783 /include/linux/platform_data | |
| parent | dmaengine: virt-dma: move function declarations (diff) | |
| parent | dmaengine: ti-dma-crossbar: enable COMPILE_TEST (diff) | |
| download | linux-dev-6619f035a64dd44c7238b7341c138a3975d59111.tar.xz linux-dev-6619f035a64dd44c7238b7341c138a3975d59111.zip | |
Merge branch 'topic/compile_test' into for-linus
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/dma-mmp_tdma.h | 2 |
1 files changed, 1 insertions, 1 deletions
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) |