summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2024-05-21 01:18:34 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2024-05-21 01:18:34 +0300
commit3eb3c33c1d87029a3832e205eebd59cfb56ba3a4 (patch)
treeaa773cdcd5c0b09712fce8b8d3bb7072b199000b /arch/arm
parent1b036162097060e7e762b601de6517d9f2c7514e (diff)
parent34cda5ab89d4f30bc8d8f8d28980a7b8c68db6ec (diff)
downloadlinux-3eb3c33c1d87029a3832e205eebd59cfb56ba3a4.tar.xz
Merge tag 'asm-generic-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
Pull asm-generic cleanups from Arnd Bergmann: "These are a few cross-architecture cleanup patches: - separate out fbdev support from the asm/video.h contents that may be used by either the old fbdev drivers or the newer drm display code (Thomas Zimmermann) - cleanups for the generic bitops code and asm-generic/bug.h (Thorsten Blum) - remove the orphaned include/asm-generic/page.h header that used to be included by long-removed mmu-less architectures (me)" * tag 'asm-generic-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: arch: Fix name collision with ACPI's video.o bug: Improve comment asm-generic: remove unused asm-generic/page.h arch: Rename fbdev header and source files arch: Remove struct fb_info from video helpers arch: Select fbdev helpers with CONFIG_VIDEO bitops: Change function return types from long to int
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/include/asm/fb.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/include/asm/fb.h b/arch/arm/include/asm/fb.h
deleted file mode 100644
index ce20a43c3033..000000000000
--- a/arch/arm/include/asm/fb.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_FB_H_
-#define _ASM_FB_H_
-
-#include <asm-generic/fb.h>
-
-#endif /* _ASM_FB_H_ */