diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-12-03 07:49:39 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-12-03 07:49:39 -0500 |
| commit | 220d0b1dbf78c6417a658c96e571415552d3abac (patch) | |
| tree | 70cd3862540c38ea490e7a27c3c7acc35b680234 /drivers/video/atafb.c | |
| parent | 474b18ccc264c472abeec50f48469b6477202699 (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Merge branch 'master' into for-2.6.33
Diffstat (limited to 'drivers/video/atafb.c')
| -rw-r--r-- | drivers/video/atafb.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c index 8cd279be74e5..37624f74e88b 100644 --- a/drivers/video/atafb.c +++ b/drivers/video/atafb.c | |||
| @@ -329,12 +329,6 @@ extern unsigned char fontdata_8x16[]; | |||
| 329 | * | 329 | * |
| 330 | * * perform fb specific mmap * | 330 | * * perform fb specific mmap * |
| 331 | * int (*fb_mmap)(struct fb_info *info, struct vm_area_struct *vma); | 331 | * int (*fb_mmap)(struct fb_info *info, struct vm_area_struct *vma); |
| 332 | * | ||
| 333 | * * save current hardware state * | ||
| 334 | * void (*fb_save_state)(struct fb_info *info); | ||
| 335 | * | ||
| 336 | * * restore saved state * | ||
| 337 | * void (*fb_restore_state)(struct fb_info *info); | ||
| 338 | * } ; | 332 | * } ; |
| 339 | */ | 333 | */ |
| 340 | 334 | ||