From 45228306ee2f0814e07187d3b88b45900d1aec92 Mon Sep 17 00:00:00 2001 From: Philippe De Muyter Date: Wed, 23 Jul 2008 21:31:50 -0700 Subject: [PATCH] --- yaml --- r: 105571 b: refs/heads/master c: 5bb49fcd501aa9fd3d321a22b7c01d9b0db7ab36 h: refs/heads/master i: 105569: b3304b51d35db0bb09b44a0e08da23aad4eb07a5 105567: 04fd434a5361556ad1230bc5d03774d68041a3fc v: v3 --- [refs] | 2 +- trunk/drivers/video/fbmem.c | 1 + trunk/include/linux/fb.h | 1 - trunk/include/linux/major.h | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3ca59f48a3a3..77e3ae9ae475 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cba603bf514c101bf48f6adf393c3d00ed457a57 +refs/heads/master: 5bb49fcd501aa9fd3d321a22b7c01d9b0db7ab36 diff --git a/trunk/drivers/video/fbmem.c b/trunk/drivers/video/fbmem.c index 6b487801eeae..5d84b3431098 100644 --- a/trunk/drivers/video/fbmem.c +++ b/trunk/drivers/video/fbmem.c @@ -35,6 +35,7 @@ #include #include #include +#include #include diff --git a/trunk/include/linux/fb.h b/trunk/include/linux/fb.h index a084d1335869..3b8870e32afd 100644 --- a/trunk/include/linux/fb.h +++ b/trunk/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/trunk/include/linux/major.h b/trunk/include/linux/major.h index 0cb98053537a..53d5fafd85c3 100644 --- a/trunk/include/linux/major.h +++ b/trunk/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