Merge master.kernel.org:/home/rmk/linux-2.6-serial

[pandora-kernel.git] / drivers / video / fbcmap.c

diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
index c32a2a5..e8b135f 100644 (file)
--- a/drivers/video/fbcmap.c
+++ b/drivers/video/fbcmap.c
@@ -13,7 +13,6 @@
 
 #include <linux/string.h>
 #include <linux/module.h>
-#include <linux/tty.h>
 #include <linux/fb.h>
 #include <linux/slab.h>
 
@@ -85,7 +84,7 @@ static struct fb_cmap default_16_colors = {
  *     Allocates memory for a colormap @cmap.  @len is the
  *     number of entries in the palette.
  *
- *     Returns -1 errno on error, or zero on success.
+ *     Returns negative errno on error, or zero on success.
  *
  */
 
@@ -116,7 +115,7 @@ int fb_alloc_cmap(struct fb_cmap *cmap, int len, int transp)
 
 fail:
     fb_dealloc_cmap(cmap);
-    return -1;
+    return -ENOMEM;
 }
 
 /**