summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorInki Dae <inki.dae@samsung.com>2015-06-23 16:06:44 +0900
committerDave Airlie <airlied@redhat.com>2015-06-24 11:18:48 +1000
commitce0bdb849ad46e4b4e4cae6913b447ae9938bdcf (patch)
tree4265c852b99b58d06f87f9ea01746cc649694f22
parent9eb1e57f564d4e6e10991402726cc83fe0b9172f (diff)
downloadlwn-ce0bdb849ad46e4b4e4cae6913b447ae9938bdcf.tar.gz
lwn-ce0bdb849ad46e4b4e4cae6913b447ae9938bdcf.zip
of: fix a build error to of_graph_get_endpoint_by_regs function
This patch fixes the below build error reported by Stephen, Stephen reported: After merging the drm-exynos tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/media/i2c/adv7604.o: In function `of_graph_get_endpoint_by_regs': adv7604.c:(.text+0x586c): multiple definition of `of_graph_get_endpoint_by_regs' drivers/media/i2c/adv7343.o:adv7343.c:(.text+0xa13): first defined here drivers/media/platform/soc_camera/atmel-isi.o: In function `of_graph_get_endpoint_by_regs': atmel-isi.c:(.text+0x1ec9): multiple definition of `of_graph_get_endpoint_by_regs' drivers/media/platform/soc_camera/soc_camera.o:soc_camera.c:(.text+0x2ce3): first defined here drivers/media/platform/soc_camera/rcar_vin.o: In function `of_graph_get_endpoint_by_regs': rcar_vin.c:(.text+0x307c): multiple definition of `of_graph_get_endpoint_by_regs' drivers/media/platform/soc_camera/soc_camera.o:soc_camera.c:(.text+0x2ce3): first defined here Caused by commit: a0f7001c18ca ("of: add helper for getting endpoint node of specific identifiers") To fix the error, this patch declares of_graph_get_endpoint_by_regs function with "static inline". Signed-off-by: Inki Dae <inki.dae@samsung.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--include/linux/of_graph.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/of_graph.h b/include/linux/of_graph.h
index 1c1d5b901a72..f8bcd0e21a26 100644
--- a/include/linux/of_graph.h
+++ b/include/linux/of_graph.h
@@ -71,7 +71,7 @@ static inline struct device_node *of_graph_get_next_endpoint(
return NULL;
}
-struct device_node *of_graph_get_endpoint_by_regs(
+static inline struct device_node *of_graph_get_endpoint_by_regs(
const struct device_node *parent, int port_reg, int reg)
{
return NULL;