diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-08-30 17:04:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-08-30 17:04:28 -0700 |
| commit | ef2a0b7cdbc5b84f7b3f6573b7687e72bede0964 (patch) | |
| tree | 6acc909d36519ec15564f50e02e8f984b8b0030a /drivers/edac | |
| parent | 8f447694c23a432b2e9cfe67fb2651f8f6655bfd (diff) | |
| parent | 86cdae14a58a877ee1ec79d39b1331bc98dace58 (diff) | |
Merge tag 'devicetree-header-cleanups-for-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree include cleanups from Rob Herring:
"These are the remaining few clean-ups of DT related includes which
didn't get applied to subsystem trees"
* tag 'devicetree-header-cleanups-for-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
ipmi: Explicitly include correct DT includes
tpm: Explicitly include correct DT includes
lib/genalloc: Explicitly include correct DT includes
parport: Explicitly include correct DT includes
sbus: Explicitly include correct DT includes
mux: Explicitly include correct DT includes
macintosh: Explicitly include correct DT includes
hte: Explicitly include correct DT includes
EDAC: Explicitly include correct DT includes
clocksource: Explicitly include correct DT includes
sparc: Explicitly include correct DT includes
riscv: Explicitly include correct DT includes
Diffstat (limited to 'drivers/edac')
| -rw-r--r-- | drivers/edac/fsl_ddr_edac.c | 3 | ||||
| -rw-r--r-- | drivers/edac/highbank_l2_edac.c | 3 | ||||
| -rw-r--r-- | drivers/edac/highbank_mc_edac.c | 3 | ||||
| -rw-r--r-- | drivers/edac/mpc85xx_edac.c | 3 | ||||
| -rw-r--r-- | drivers/edac/npcm_edac.c | 3 | ||||
| -rw-r--r-- | drivers/edac/synopsys_edac.c | 1 |
6 files changed, 8 insertions, 8 deletions
diff --git a/drivers/edac/fsl_ddr_edac.c b/drivers/edac/fsl_ddr_edac.c index ac2102b25706..b81757555a8a 100644 --- a/drivers/edac/fsl_ddr_edac.c +++ b/drivers/edac/fsl_ddr_edac.c @@ -22,8 +22,7 @@ #include <linux/smp.h> #include <linux/gfp.h> -#include <linux/of_platform.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/of_address.h> #include "edac_module.h" #include "fsl_ddr_edac.h" diff --git a/drivers/edac/highbank_l2_edac.c b/drivers/edac/highbank_l2_edac.c index c4549cec788b..140d4431bd0d 100644 --- a/drivers/edac/highbank_l2_edac.c +++ b/drivers/edac/highbank_l2_edac.c @@ -7,8 +7,9 @@ #include <linux/ctype.h> #include <linux/edac.h> #include <linux/interrupt.h> +#include <linux/of.h> +#include <linux/of_device.h> #include <linux/platform_device.h> -#include <linux/of_platform.h> #include "edac_module.h" diff --git a/drivers/edac/highbank_mc_edac.c b/drivers/edac/highbank_mc_edac.c index 19fba258ae10..a0c04a7f95e9 100644 --- a/drivers/edac/highbank_mc_edac.c +++ b/drivers/edac/highbank_mc_edac.c @@ -7,8 +7,9 @@ #include <linux/ctype.h> #include <linux/edac.h> #include <linux/interrupt.h> +#include <linux/of.h> +#include <linux/of_device.h> #include <linux/platform_device.h> -#include <linux/of_platform.h> #include <linux/uaccess.h> #include "edac_module.h" diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c index 55320546c174..2b5703e5066e 100644 --- a/drivers/edac/mpc85xx_edac.c +++ b/drivers/edac/mpc85xx_edac.c @@ -22,8 +22,7 @@ #include <linux/gfp.h> #include <linux/fsl/edac.h> -#include <linux/of_platform.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/of_address.h> #include <linux/of_irq.h> #include "edac_module.h" diff --git a/drivers/edac/npcm_edac.c b/drivers/edac/npcm_edac.c index 12b95be3e989..6d15c1550263 100644 --- a/drivers/edac/npcm_edac.c +++ b/drivers/edac/npcm_edac.c @@ -3,7 +3,8 @@ #include <linux/debugfs.h> #include <linux/iopoll.h> -#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/platform_device.h> #include <linux/regmap.h> #include "edac_module.h" diff --git a/drivers/edac/synopsys_edac.c b/drivers/edac/synopsys_edac.c index f7d37c282819..c4fc64cbecd0 100644 --- a/drivers/edac/synopsys_edac.c +++ b/drivers/edac/synopsys_edac.c @@ -11,7 +11,6 @@ #include <linux/platform_device.h> #include <linux/interrupt.h> #include <linux/of.h> -#include <linux/of_device.h> #include "edac_module.h" |