summaryrefslogtreecommitdiffstats
path: root/drivers/video/fbcvt.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-04-16 15:20:06 +0200
committerTakashi Iwai <tiwai@suse.de>2010-04-16 15:20:06 +0200
commitcf0dbba515415bb19b11f9323d5f7bebd7f24fd6 (patch)
tree375bbc1ade1a92acd6493d224dd701fd7f209014 /drivers/video/fbcvt.c
parentALSA: i2c: Fixed 8 checkpatch errors (diff)
parentALSA: Release v1.0.23 (diff)
downloadlinux-cf0dbba515415bb19b11f9323d5f7bebd7f24fd6.tar.xz
linux-cf0dbba515415bb19b11f9323d5f7bebd7f24fd6.zip
Merge remote branch 'alsa/devel' into topic/misc
Diffstat (limited to 'drivers/video/fbcvt.c')
-rw-r--r--drivers/video/fbcvt.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/fbcvt.c b/drivers/video/fbcvt.c
index 0847c5e72cbd..7293eaccd81b 100644
--- a/drivers/video/fbcvt.c
+++ b/drivers/video/fbcvt.c
@@ -13,6 +13,7 @@
*
*/
#include <linux/fb.h>
+#include <linux/slab.h>
#define FB_CVT_CELLSIZE 8
#define FB_CVT_GTF_C 40