Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ce228c1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "coresight: of_get_coresight_platform_data needs both OF and CORESIGHT"

parents e6f2a57f 22235f21

include/linux/coresight.h

+2 −2
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ static inline int coresight_timeout(void __iomem *addr, u32 offset, 
static inline void coresight_abort(void) {}

#endif



#ifdef CONFIG_OF

#if defined(CONFIG_OF) && defined(CONFIG_CORESIGHT)

extern struct coresight_platform_data *of_get_coresight_platform_data(

				struct device *dev, struct device_node *node);

extern struct coresight_cti_data *of_get_coresight_cti_data(
@@ -275,7 +275,7 @@ extern struct coresight_cti_data *of_get_coresight_cti_data( 
#else

static inline struct coresight_platform_data *of_get_coresight_platform_data(

	struct device *dev, struct device_node *node) { return NULL; }

static inlint struct coresight_cti_data *of_get_coresight_cti_data(

static inline struct coresight_cti_data *of_get_coresight_cti_data(

		struct device *dev, struct device_node *node) { return NULL; }

#endif