Commit 3eb3c33c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1b036162 34cda5ab

arch/arc/include/asm/fb.h

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



#ifndef _ASM_FB_H_

#define _ASM_FB_H_



#include <asm-generic/fb.h>



#endif /* _ASM_FB_H_ */

arch/arm/include/asm/fb.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#ifndef _ASM_FB_H_

#define _ASM_FB_H_



#include <asm-generic/fb.h>



#endif /* _ASM_FB_H_ */

arch/arm64/include/asm/fb.h

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (C) 2012 ARM Ltd.

 */

#ifndef __ASM_FB_H_

#define __ASM_FB_H_



#include <asm-generic/fb.h>



#endif /* __ASM_FB_H_ */

arch/loongarch/include/asm/fb.h→arch/loongarch/include/asm/video.h

+4 −4
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
/*

 * Copyright (C) 2020-2022 Loongson Technology Corporation Limited

 */

#ifndef _ASM_FB_H_

#define _ASM_FB_H_

#ifndef _ASM_VIDEO_H_

#define _ASM_VIDEO_H_



#include <linux/compiler.h>

#include <linux/string.h>
@@ -26,6 +26,6 @@ static inline void fb_memset_io(volatile void __iomem *addr, int c, size_t n) 
}

#define fb_memset fb_memset_io



#include <asm-generic/fb.h>

#include <asm-generic/video.h>



#endif /* _ASM_FB_H_ */
 
#endif /* _ASM_VIDEO_H_ */

arch/m68k/include/asm/fb.h→arch/m68k/include/asm/video.h

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

#ifndef _ASM_FB_H_

#define _ASM_FB_H_

#ifndef _ASM_VIDEO_H_

#define _ASM_VIDEO_H_



#include <asm/page.h>

#include <asm/setup.h>
@@ -27,6 +27,6 @@ static inline pgprot_t pgprot_framebuffer(pgprot_t prot, 
}

#define pgprot_framebuffer pgprot_framebuffer



#include <asm-generic/fb.h>

#include <asm-generic/video.h>



#endif /* _ASM_FB_H_ */
 
#endif /* _ASM_VIDEO_H_ */