Merge tag 'for-3.11-rc1' of git://gitorious.org/linux-pwm/linux-pwm

[cascardo/linux.git] / drivers / video / fbmem.c

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 9217be3..36e1fe2 100644 (file)
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1883,7 +1883,7 @@ static int ofonly __read_mostly;
  *
  * NOTE: Needed to maintain backwards compatibility
  */
-int fb_get_options(char *name, char **option)
+int fb_get_options(const char *name, char **option)
 {
        char *opt, *options = NULL;
        int retval = 0;