arch/x86/include/asm/device.h is identical to
include/asm-generic/device.h, and therefore the x86-specific version
is unnecessary. Remove it.

Signed-off-by: Ethan Nelson-Moore <enelsonmoore@gmail.com>
---
 arch/x86/include/asm/device.h | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 arch/x86/include/asm/device.h

diff --git a/arch/x86/include/asm/device.h b/arch/x86/include/asm/device.h
deleted file mode 100644
index 7c0a52ca2f4d..000000000000
--- a/arch/x86/include/asm/device.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _ASM_X86_DEVICE_H
-#define _ASM_X86_DEVICE_H
-
-struct dev_archdata {
-};
-
-struct pdev_archdata {
-};
-
-#endif /* _ASM_X86_DEVICE_H */
-- 
2.43.0

The following commit has been merged into the x86/misc branch of tip:

Commit-ID:     c256d2a8adf2f5670ca262979c451ec4c1108e38
Gitweb:        https://git.kernel.org/tip/c256d2a8adf2f5670ca262979c451ec4c1108e38
Author:        Ethan Nelson-Moore <enelsonmoore@gmail.com>
AuthorDate:    Sat, 16 May 2026 19:57:08 -07:00
Committer:     Dave Hansen <dave.hansen@linux.intel.com>
CommitterDate: Mon, 18 May 2026 16:50:09 -07:00

x86: Remove unnecessary architecture-specific <asm/device.h>

arch/x86/include/asm/device.h is identical to
include/asm-generic/device.h, and therefore the x86-specific version
is unnecessary. Remove it.

[ dhansen: Minor note: It looks like if asm/foo.h does not exist that
	   the build system generates one that does a #include
	   <asm-generic/foo.h>. Thus, all that needs to be done is
	   remove the arch-specific one. ]

Signed-off-by: Ethan Nelson-Moore <enelsonmoore@gmail.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Link: https://patch.msgid.link/20260517025713.97791-1-enelsonmoore@gmail.com
---
 arch/x86/include/asm/device.h | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 arch/x86/include/asm/device.h

diff --git a/arch/x86/include/asm/device.h b/arch/x86/include/asm/device.h
deleted file mode 100644
index 7c0a52c..0000000
--- a/arch/x86/include/asm/device.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _ASM_X86_DEVICE_H
-#define _ASM_X86_DEVICE_H
-
-struct dev_archdata {
-};
-
-struct pdev_archdata {
-};
-
-#endif /* _ASM_X86_DEVICE_H */