diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2016-10-02 23:46:03 -0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-10-02 23:46:03 -0400 |
| commit | 6619f035a64dd44c7238b7341c138a3975d59111 (patch) | |
| tree | fce47632273afaa50960abb2c60a04bf63e44783 /include/linux/platform_data | |
| parent | 02aa84860c29f3f5a57e959982c811df46a2736c (diff) | |
| parent | 509cf0b8146c73e6f29bcf732d1af1b1aed5ec01 (diff) | |
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 { | |||
| 28 | int granularity; | 28 | int granularity; |
| 29 | }; | 29 | }; |
| 30 | 30 | ||
| 31 | #ifdef CONFIG_ARM | 31 | #ifdef CONFIG_MMP_SRAM |
| 32 | extern struct gen_pool *sram_get_gpool(char *pool_name); | 32 | extern struct gen_pool *sram_get_gpool(char *pool_name); |
| 33 | #else | 33 | #else |
| 34 | static inline struct gen_pool *sram_get_gpool(char *pool_name) | 34 | static inline struct gen_pool *sram_get_gpool(char *pool_name) |