git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
video
/
fbcmap.c
diff --git
a/drivers/video/fbcmap.c
b/drivers/video/fbcmap.c
index
e8b135f
..
c32a2a5
100644
(file)
--- a/
drivers/video/fbcmap.c
+++ b/
drivers/video/fbcmap.c
@@
-13,6
+13,7
@@
#include <linux/string.h>
#include <linux/module.h>
#include <linux/string.h>
#include <linux/module.h>
+#include <linux/tty.h>
#include <linux/fb.h>
#include <linux/slab.h>
#include <linux/fb.h>
#include <linux/slab.h>
@@
-84,7
+85,7
@@
static struct fb_cmap default_16_colors = {
* Allocates memory for a colormap @cmap. @len is the
* number of entries in the palette.
*
* Allocates memory for a colormap @cmap. @len is the
* number of entries in the palette.
*
- * Returns
negative
errno on error, or zero on success.
+ * Returns
-1
errno on error, or zero on success.
*
*/
*
*/
@@
-115,7
+116,7
@@
int fb_alloc_cmap(struct fb_cmap *cmap, int len, int transp)
fail:
fb_dealloc_cmap(cmap);
fail:
fb_dealloc_cmap(cmap);
- return -
ENOMEM
;
+ return -
1
;
}
/**
}
/**