The DT of_device.h and of_platform.h date back to the separate of_platform_bus_type before it as merged into the regular platform bus. As part of that merge prepping Arm DT support 13 years ago, they "temporarily" include each other. They also include platform_device.h and of.h. As a result, there's a pretty much random mix of those include files used throughout the tree. In order to detangle these headers and replace the implicit includes with struct declarations, users need to explicitly include the correct includes. Signed-off-by: Rob Herring <robh@xxxxxxxxxx> --- drivers/mux/core.c | 1 - drivers/mux/mmio.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/mux/core.c b/drivers/mux/core.c index 990e7bc17c85..775816112932 100644 --- a/drivers/mux/core.c +++ b/drivers/mux/core.c @@ -19,7 +19,6 @@ #include <linux/mux/consumer.h> #include <linux/mux/driver.h> #include <linux/of.h> -#include <linux/of_platform.h> #include <linux/slab.h> /* diff --git a/drivers/mux/mmio.c b/drivers/mux/mmio.c index 245bc07eee4b..fd1d121a584b 100644 --- a/drivers/mux/mmio.c +++ b/drivers/mux/mmio.c @@ -10,7 +10,7 @@ #include <linux/mfd/syscon.h> #include <linux/module.h> #include <linux/mux/driver.h> -#include <linux/of_platform.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/property.h> #include <linux/regmap.h> -- 2.40.1
