diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-03-19 03:05:10 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-03-19 03:05:10 -0400 |
| commit | b4b7a4ef097f288f724420b473dbf92a89c0ab7e (patch) | |
| tree | 23ad8101e3e77c32a8d1e1b95a9c1cd7f7a475b7 /drivers/video/w100fb.c | |
| parent | e9ce335df51ff782035a15c261a3c0c9892a1767 (diff) | |
| parent | a3d3203e4bb40f253b1541e310dc0f9305be7c84 (diff) | |
Merge branch 'master' into for-linus
Conflicts:
block/Kconfig
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/video/w100fb.c')
| -rw-r--r-- | drivers/video/w100fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/w100fb.c b/drivers/video/w100fb.c index 2376f688ec8b..5d223959778a 100644 --- a/drivers/video/w100fb.c +++ b/drivers/video/w100fb.c | |||
| @@ -628,7 +628,7 @@ static int w100fb_resume(struct platform_device *dev) | |||
| 628 | #endif | 628 | #endif |
| 629 | 629 | ||
| 630 | 630 | ||
| 631 | int __init w100fb_probe(struct platform_device *pdev) | 631 | int __devinit w100fb_probe(struct platform_device *pdev) |
| 632 | { | 632 | { |
| 633 | int err = -EIO; | 633 | int err = -EIO; |
| 634 | struct w100fb_mach_info *inf; | 634 | struct w100fb_mach_info *inf; |