diff options
| author | Philippe De Muyter <phdm@macqel.be> | 2008-07-24 00:31:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 13:47:41 -0400 |
| commit | 5bb49fcd501aa9fd3d321a22b7c01d9b0db7ab36 (patch) | |
| tree | 056028eae394c961fd45aade9a22f406d0b747bb /drivers/video | |
| parent | cba603bf514c101bf48f6adf393c3d00ed457a57 (diff) | |
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>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/fbmem.c | 1 |
1 files changed, 1 insertions, 0 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 | ||