diff options
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/video.h (renamed from arch/x86/include/asm/fb.h) | 8 | ||||
| -rw-r--r-- | arch/x86/video/Makefile | 2 | ||||
| -rw-r--r-- | arch/x86/video/video.c (renamed from arch/x86/video/fbdev.c) | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/arch/x86/include/asm/fb.h b/arch/x86/include/asm/video.h index 999db3379286..0950c9535fae 100644 --- a/arch/x86/include/asm/fb.h +++ b/arch/x86/include/asm/video.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_X86_FB_H -#define _ASM_X86_FB_H +#ifndef _ASM_X86_VIDEO_H +#define _ASM_X86_VIDEO_H #include <linux/types.h> @@ -16,6 +16,6 @@ pgprot_t pgprot_framebuffer(pgprot_t prot, bool video_is_primary_device(struct device *dev); #define video_is_primary_device video_is_primary_device -#include <asm-generic/fb.h> +#include <asm-generic/video.h> -#endif /* _ASM_X86_FB_H */ +#endif /* _ASM_X86_VIDEO_H */ diff --git a/arch/x86/video/Makefile b/arch/x86/video/Makefile index 9dd82880a027..fdf83a408d75 100644 --- a/arch/x86/video/Makefile +++ b/arch/x86/video/Makefile @@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-y += fbdev.o +obj-y += video.o diff --git a/arch/x86/video/fbdev.c b/arch/x86/video/video.c index 4d87ce8e257f..81fc97a2a837 100644 --- a/arch/x86/video/fbdev.c +++ b/arch/x86/video/video.c @@ -10,7 +10,8 @@ #include <linux/module.h> #include <linux/pci.h> #include <linux/vgaarb.h> -#include <asm/fb.h> + +#include <asm/video.h> pgprot_t pgprot_framebuffer(pgprot_t prot, unsigned long vm_start, unsigned long vm_end, |