hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

video/fb: cleanup FB_MAJOR usage 

Currently, linux/major.h defines a GRAPHDEV_MAJOR (29) that nobody uses,
and linux/fb.h defines the real FB_MAJOR (also 29), that only fbmem.c
needs.  Drop GRAPHDEV_MAJOR from major.h, move FB_MAJOR definition from
fb.h to major.h, and fix fbmem.c to use major.h's definition.

Signed-off-by: Philippe De Muyter <phdm@macqel.be>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Philippe De Muyter 2008-07-23 21:31:50 -07:00 committed by Linus Torvalds
parent cba603bf51
commit 5bb49fcd50
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/video/fbmem.c
View File

@ -35,6 +35,7 @@
#include <linux/device.h> #include <linux/device.h>
#include <linux/efi.h> #include <linux/efi.h>
#include <linux/fb.h> #include <linux/fb.h>
#include <linux/major.h>
#include <asm/fb.h> #include <asm/fb.h>

1
include/linux/fb.h
View File

@ -8,7 +8,6 @@ struct dentry;
/* Definitions of frame buffers */ /* Definitions of frame buffers */
#define FB_MAJOR 29
#define FB_MAX 32 /* sufficient for now */ #define FB_MAX 32 /* sufficient for now */
/* ioctls /* ioctls

2
include/linux/major.h
View File

@ -53,7 +53,7 @@
#define STL_SIOMEMMAJOR 28 #define STL_SIOMEMMAJOR 28
#define ACSI_MAJOR 28 #define ACSI_MAJOR 28
#define AZTECH_CDROM_MAJOR 29 #define AZTECH_CDROM_MAJOR 29
#define GRAPHDEV_MAJOR 29 /* SparcLinux & Linux/68k /dev/fb */ #define FB_MAJOR 29 /* /dev/fb* framebuffers */
#define CM206_CDROM_MAJOR 32 #define CM206_CDROM_MAJOR 32
#define IDE2_MAJOR 33 #define IDE2_MAJOR 33
#define IDE3_MAJOR 34 #define IDE3_MAJOR 34