From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 31 Aug 2023 00:04:28 +0000 (-0700)
Subject: Merge tag 'devicetree-header-cleanups-for-6.6' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: v6.6.7~2045
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ef2a0b7cdbc5b84f7b3f6573b7687e72bede0964;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'devicetree-header-cleanups-for-6.6' of git://git./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
---

ef2a0b7cdbc5b84f7b3f6573b7687e72bede0964
diff --cc drivers/char/tpm/tpm_tis.c
index 077fdb7,e4030404..2c52b79
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@@ -25,8 -25,8 +25,7 @@@
  #include <linux/acpi.h>
  #include <linux/freezer.h>
  #include <linux/of.h>
- #include <linux/of_device.h>
  #include <linux/kernel.h>
 -#include <linux/dmi.h>
  #include "tpm.h"
  #include "tpm_tis_core.h"