diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-06-18 03:36:46 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-06-18 03:36:46 -0400 |
| commit | 0107b3cf3225aed6ddde4fa8dbcd4ed643b34f4d (patch) | |
| tree | 9b9337ae627fc56a0eda43c60860765f25efaa0b /drivers/video/fbsysfs.c | |
| parent | 1c3f45ab2f7f879ea482501c83899505c31f7539 (diff) | |
| parent | 9ee1c939d1cb936b1f98e8d81aeffab57bae46ab (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/video/fbsysfs.c')
| -rw-r--r-- | drivers/video/fbsysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c index c78a2c5961d3..277d733c6d00 100644 --- a/drivers/video/fbsysfs.c +++ b/drivers/video/fbsysfs.c | |||
| @@ -241,7 +241,7 @@ static ssize_t show_virtual(struct class_device *class_device, char *buf) | |||
| 241 | struct fb_info *fb_info = | 241 | struct fb_info *fb_info = |
| 242 | (struct fb_info *)class_get_devdata(class_device); | 242 | (struct fb_info *)class_get_devdata(class_device); |
| 243 | return snprintf(buf, PAGE_SIZE, "%d,%d\n", fb_info->var.xres_virtual, | 243 | return snprintf(buf, PAGE_SIZE, "%d,%d\n", fb_info->var.xres_virtual, |
| 244 | fb_info->var.xres_virtual); | 244 | fb_info->var.yres_virtual); |
| 245 | } | 245 | } |
| 246 | 246 | ||
| 247 | static ssize_t store_cmap(struct class_device *class_device, const char * buf, | 247 | static ssize_t store_cmap(struct class_device *class_device, const char * buf, |