diff options
| -rw-r--r-- | drivers/video/fbmem.c | 1 | ||||
| -rw-r--r-- | include/linux/fb.h | 1 | ||||
| -rw-r--r-- | include/linux/major.h | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index 6b487801eeae..5d84b3431098 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <linux/device.h> | 35 | #include <linux/device.h> |
| 36 | #include <linux/efi.h> | 36 | #include <linux/efi.h> |
| 37 | #include <linux/fb.h> | 37 | #include <linux/fb.h> |
| 38 | #include <linux/major.h> | ||
| 38 | 39 | ||
| 39 | #include <asm/fb.h> | 40 | #include <asm/fb.h> |
| 40 | 41 | ||
diff --git a/include/linux/fb.h b/include/linux/fb.h index a084d1335869..3b8870e32afd 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h | |||
| @@ -8,7 +8,6 @@ struct dentry; | |||
| 8 | 8 | ||
| 9 | /* Definitions of frame buffers */ | 9 | /* Definitions of frame buffers */ |
| 10 | 10 | ||
| 11 | #define FB_MAJOR 29 | ||
| 12 | #define FB_MAX 32 /* sufficient for now */ | 11 | #define FB_MAX 32 /* sufficient for now */ |
| 13 | 12 | ||
| 14 | /* ioctls | 13 | /* ioctls |
diff --git a/include/linux/major.h b/include/linux/major.h index 0cb98053537a..53d5fafd85c3 100644 --- a/include/linux/major.h +++ b/include/linux/major.h | |||
| @@ -53,7 +53,7 @@ | |||
| 53 | #define STL_SIOMEMMAJOR 28 | 53 | #define STL_SIOMEMMAJOR 28 |
| 54 | #define ACSI_MAJOR 28 | 54 | #define ACSI_MAJOR 28 |
| 55 | #define AZTECH_CDROM_MAJOR 29 | 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 | #define CM206_CDROM_MAJOR 32 | 57 | #define CM206_CDROM_MAJOR 32 |
| 58 | #define IDE2_MAJOR 33 | 58 | #define IDE2_MAJOR 33 |
| 59 | #define IDE3_MAJOR 34 | 59 | #define IDE3_MAJOR 34 |
