diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
| commit | 99a7e12f34b3661a0d1354eef83a0eef4df5e34c (patch) | |
| tree | 3560aca9ca86792f9ab7bd87861ea143a1b3c7a3 /include/linux/fb.h | |
| parent | e73a04659c0b8cdee4dd40e58630e2cf63afb316 (diff) | |
Merge with Linux 2.3.38.
Diffstat (limited to 'include/linux/fb.h')
| -rw-r--r-- | include/linux/fb.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h index 78fb24d23..c537cfb36 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -6,12 +6,8 @@ /* Definitions of frame buffers */ -#define FB_MAJOR 29 - -#define FB_MODES_SHIFT 5 /* 32 modes per framebuffer */ -#define FB_NUM_MINORS 256 /* 256 Minors */ -#define FB_MAX (FB_NUM_MINORS / (1 << FB_MODES_SHIFT)) -#define GET_FB_IDX(node) (MINOR(node) >> FB_MODES_SHIFT) +#define FB_MAJOR 29 +#define FB_MAX 32 /* sufficient for now */ /* ioctls 0x46 is 'F' */ @@ -211,6 +207,12 @@ struct fb_monspecs { #ifdef __KERNEL__ +#if 1 /* to go away in 2.4.0 */ +extern int GET_FB_IDX(kdev_t rdev); +#else +#define GET_FB_IDX(node) (MINOR(node)) +#endif + #include <linux/fs.h> #include <linux/init.h> |