diff options
| author | Mathieu Poirier <mathieu.poirier@linaro.org> | 2015-01-09 16:57:20 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-12 05:04:13 -0800 |
| commit | c61c4b5dd2c6b5dbf0f7e299db1e8411ef590f5c (patch) | |
| tree | 094b8b118cccc1bcc8f4074a8d348fa3fd887fc0 /include/linux/coresight.h | |
| parent | ff1e33b0c16ba422e3bf3fa8cc7e89b2c958e193 (diff) | |
| download | talos-obmc-linux-c61c4b5dd2c6b5dbf0f7e299db1e8411ef590f5c.tar.gz talos-obmc-linux-c61c4b5dd2c6b5dbf0f7e299db1e8411ef590f5c.zip | |
coresight: Fixing wrong #ifdef/#endif placement
Fixing problem reported by:
https://lkml.org/lkml/2015/1/6/86
The #ifdef/#endif is wrong and prevents the stub of function
of_get_coresight_platform_data() from being visible when
CONFIG_OF is not defined.
Moving CONFIG_OF condition out of CONFIG_CORESIGHT, making
them both independent.
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/coresight.h')
| -rw-r--r-- | include/linux/coresight.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/coresight.h b/include/linux/coresight.h index 7cbfecbfa643..cd6d4c384ca3 100644 --- a/include/linux/coresight.h +++ b/include/linux/coresight.h @@ -230,10 +230,6 @@ extern void coresight_disable(struct coresight_device *csdev); extern int coresight_is_bit_set(u32 val, int position, int value); extern int coresight_timeout(void __iomem *addr, u32 offset, int position, int value); -#ifdef CONFIG_OF -extern struct coresight_platform_data *of_get_coresight_platform_data( - struct device *dev, struct device_node *node); -#endif #else static inline struct coresight_device * coresight_register(struct coresight_desc *desc) { return NULL; } @@ -245,10 +241,14 @@ static inline int coresight_is_bit_set(u32 val, int position, int value) { return 0; } static inline int coresight_timeout(void __iomem *addr, u32 offset, int position, int value) { return 1; } +#endif + #ifdef CONFIG_OF +extern struct coresight_platform_data *of_get_coresight_platform_data( + struct device *dev, struct device_node *node); +#else static inline struct coresight_platform_data *of_get_coresight_platform_data( struct device *dev, struct device_node *node) { return NULL; } #endif -#endif #endif |
