diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-21 00:18:34 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-21 00:18:34 +0200 |
| commit | 3eb3c33c1d87029a3832e205eebd59cfb56ba3a4 (patch) | |
| tree | aa773cdcd5c0b09712fce8b8d3bb7072b199000b /arch/arm/include/asm | |
| parent | Merge tag 'soc-dt-late-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | arch: Fix name collision with ACPI's video.o (diff) | |
| download | linux-3eb3c33c1d87029a3832e205eebd59cfb56ba3a4.tar.xz linux-3eb3c33c1d87029a3832e205eebd59cfb56ba3a4.zip | |
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/include/asm')
| -rw-r--r-- | arch/arm/include/asm/fb.h | 6 |
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_ */ |