Commit ef2a0b7c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'devicetree-header-cleanups-for-6.6' of... 

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
parents 8f447694 86cdae14

arch/riscv/kernel/cpufeature.c

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/memory.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <asm/acpi.h>

#include <asm/alternative.h>

#include <asm/cacheflush.h>

arch/sparc/crypto/crop_devid.c

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <linux/mod_devicetable.h>

#include <linux/module.h>

#include <linux/of_device.h>



/* This is a dummy device table linked into all of the crypto

 * opcode drivers.  It serves to trigger the module autoloading

arch/sparc/include/asm/floppy_32.h

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#define __ASM_SPARC_FLOPPY_H



#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_platform.h>

#include <linux/pgtable.h>



#include <asm/idprom.h>

arch/sparc/include/asm/floppy_64.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#define __ASM_SPARC64_FLOPPY_H



#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_platform.h>

#include <linux/dma-mapping.h>



#include <asm/auxio.h>

arch/sparc/include/asm/parport.h

+2 −1
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ 
#ifndef _ASM_SPARC64_PARPORT_H

#define _ASM_SPARC64_PARPORT_H 1



#include <linux/of_device.h>

#include <linux/of.h>

#include <linux/platform_device.h>



#include <asm/ebus_dma.h>

#include <asm/ns87303.h>