Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

[~andy/linux] / include / linux / fb.h

diff --git a/include/linux/fb.h b/include/linux/fb.h
index d49c60f5aa4c52250e5e5c9549ccb4fdf105d3ce..ffac70aab3e96bb62de132658e5a8513de8c0cab 100644 (file)
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -624,7 +624,7 @@ extern void fb_pad_aligned_buffer(u8 *dst, u32 d_pitch, u8 *src, u32 s_pitch, u3
 extern void fb_set_suspend(struct fb_info *info, int state);
 extern int fb_get_color_depth(struct fb_var_screeninfo *var,
                              struct fb_fix_screeninfo *fix);
-extern int fb_get_options(char *name, char **option);
+extern int fb_get_options(const char *name, char **option);
 extern int fb_new_modelist(struct fb_info *info);
 
 extern struct fb_info *registered_fb[FB_MAX];