diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2013-06-28 06:01:28 -0400 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2013-06-28 06:01:28 -0400 |
| commit | 19fd7441e9cc29b6c6d73c5469b3c93aa245fbb5 (patch) | |
| tree | ab5e98ae677baecab3155b34983d97ffd08281c0 /drivers/video/i740fb.c | |
| parent | b75bf98b5d2b7fdb876d3dd7eaec8246d4cc7174 (diff) | |
| parent | 464d8a54a0ca7827a2278e2122e5eb22462ae044 (diff) | |
Merge tag 'fbdev-3.11-2' of git://gitorious.org/linux-omap-dss2/linux into fbdev/for-next
Various fbdev changes for 3.11
* xilinxfb updates
* Small cleanups and fixes to multiple drivers
Diffstat (limited to 'drivers/video/i740fb.c')
| -rw-r--r-- | drivers/video/i740fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/i740fb.c b/drivers/video/i740fb.c index cfd0c52e8f73..6c4838818950 100644 --- a/drivers/video/i740fb.c +++ b/drivers/video/i740fb.c | |||
| @@ -1302,7 +1302,7 @@ static int __init i740fb_setup(char *options) | |||
| 1302 | } | 1302 | } |
| 1303 | #endif | 1303 | #endif |
| 1304 | 1304 | ||
| 1305 | int __init i740fb_init(void) | 1305 | static int __init i740fb_init(void) |
| 1306 | { | 1306 | { |
| 1307 | #ifndef MODULE | 1307 | #ifndef MODULE |
| 1308 | char *option = NULL; | 1308 | char *option = NULL; |