diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-10 18:44:39 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-10 18:44:39 +0100 |
| commit | 67b738ef32df7ec429004866d2a739a3775894d2 (patch) | |
| tree | 5c67fa0cea6cc7298321480eda2df04bef795305 /drivers/video/fbcmap.c | |
| parent | Merge branch 'devel-cleanup' into omap-for-linus (diff) | |
| parent | omap2+: Initialize omap_irq_base for entry-macro.S from platform code (diff) | |
| download | linux-67b738ef32df7ec429004866d2a739a3775894d2.tar.xz linux-67b738ef32df7ec429004866d2a739a3775894d2.zip | |
Merge branch 'devel-omap-irq' into omap-for-linus
Diffstat (limited to 'drivers/video/fbcmap.c')
| -rw-r--r-- | drivers/video/fbcmap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c index affdf3e32cf3..5c3960da755a 100644 --- 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. |