diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-08-29 05:14:30 -0400 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-08-29 05:14:30 -0400 |
| commit | d4a7dbfdf180a656de3eb9e64614e2b991ffaa53 (patch) | |
| tree | f7d0d548004751aea77f63e6fd695faf0785bde0 /drivers/video/controlfb.c | |
| parent | b5480ed72e4f299c53d1857faaf4f492650ccc43 (diff) | |
| parent | fa514fbc57419505d0e9423dbb8742f2775f882e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x into fbdev-next
Conflicts:
drivers/video/atmel_lcdfb.c
Diffstat (limited to 'drivers/video/controlfb.c')
| -rw-r--r-- | drivers/video/controlfb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/controlfb.c b/drivers/video/controlfb.c index 9075bea55879..7b2c40abae15 100644 --- a/drivers/video/controlfb.c +++ b/drivers/video/controlfb.c | |||
| @@ -550,7 +550,7 @@ static void control_set_hardware(struct fb_info_control *p, struct fb_par_contro | |||
| 550 | 550 | ||
| 551 | 551 | ||
| 552 | /* | 552 | /* |
| 553 | * Parse user speficied options (`video=controlfb:') | 553 | * Parse user specified options (`video=controlfb:') |
| 554 | */ | 554 | */ |
| 555 | static void __init control_setup(char *options) | 555 | static void __init control_setup(char *options) |
| 556 | { | 556 | { |