diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index 6b487801eeaedc96e8b65a330363156e32452f6c..5d84b34310981227bf719aabae37407a5bbbc79e 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c @@ -35,6 +35,7 @@ #include #include #include +#include #include diff --git a/include/linux/fb.h b/include/linux/fb.h index a084d1335869ad9a09a7e8d0677ff3669f2a8aec..3b8870e32afdd14b8166dd876762c0986cafd4ab 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -8,7 +8,6 @@ struct dentry; /* Definitions of frame buffers */ -#define FB_MAJOR 29 #define FB_MAX 32 /* sufficient for now */ /* ioctls diff --git a/include/linux/major.h b/include/linux/major.h index 0cb98053537af4874ef83cfc149c6af629758694..53d5fafd85c30a61e381f7d3762fa6a3841aca6c 100644 --- a/include/linux/major.h +++ b/include/linux/major.h @@ -53,7 +53,7 @@ #define STL_SIOMEMMAJOR 28 #define ACSI_MAJOR 28 #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 IDE2_MAJOR 33 #define IDE3_MAJOR 34