Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6

[deliverable/linux.git] / drivers / video / fbcmap.c

diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
index affdf3e32cf312bb418fb228182cb26abf4a67bb..5c3960da755aa52eefe1069442e9a43341e43e8c 100644 (file)
--- a/drivers/video/fbcmap.c
+++ b/drivers/video/fbcmap.c
@@ -80,6 +80,7 @@ static const struct fb_cmap default_16_colors = {
  *     @cmap: frame buffer colormap structure
  *     @len: length of @cmap
  *     @transp: boolean, 1 if there is transparency, 0 otherwise
+ *     @flags: flags for kmalloc memory allocation
  *
  *     Allocates memory for a colormap @cmap.  @len is the
  *     number of entries in the palette.