Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Philippe De Muyter and committed by
Linus Torvalds
5bb49fcd cba603bf

+2 -2
+1
drivers/video/fbmem.c
··· 35 35 #include <linux/device.h> 36 36 #include <linux/efi.h> 37 37 #include <linux/fb.h> 38 + #include <linux/major.h> 38 39 39 40 #include <asm/fb.h> 40 41
-1
include/linux/fb.h
··· 8 8 9 9 /* Definitions of frame buffers */ 10 10 11 - #define FB_MAJOR 29 12 11 #define FB_MAX 32 /* sufficient for now */ 13 12 14 13 /* ioctls
+1 -1
include/linux/major.h
··· 53 53 #define STL_SIOMEMMAJOR 28 54 54 #define ACSI_MAJOR 28 55 55 #define AZTECH_CDROM_MAJOR 29 56 - #define GRAPHDEV_MAJOR 29 /* SparcLinux & Linux/68k /dev/fb */ 56 + #define FB_MAJOR 29 /* /dev/fb* framebuffers */ 57 57 #define CM206_CDROM_MAJOR 32 58 58 #define IDE2_MAJOR 33 59 59 #define IDE3_MAJOR 34