浏览代码

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>
Philippe De Muyter 17 年之前
父节点
当前提交
5bb49fcd50
共有 3 个文件被更改,包括 2 次插入2 次删除
  1. 1 0
      drivers/video/fbmem.c
  2. 0 1
      include/linux/fb.h
  3. 1 1
      include/linux/major.h

+ 1 - 0
drivers/video/fbmem.c

@@ -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>
 
 

+ 0 - 1
include/linux/fb.h

@@ -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

+ 1 - 1
include/linux/major.h

@@ -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