kconfig: move initramfs options to General Setup

[linux-2.6] / drivers / video / fbsysfs.c

diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c
index 2bdda4010b81dd92ea0fb704c3fd1a698f6c72a5..ddc9443254d9dc0bfac823614da46923dfebd354 100644 (file)
--- a/drivers/video/fbsysfs.c
+++ b/drivers/video/fbsysfs.c
@@ -228,8 +228,6 @@ static ssize_t store_virtual(struct class_device *class_device,
        if (last - buf >= count)
                return -EINVAL;
        var.yres_virtual = simple_strtoul(last, &last, 0);
-       printk(KERN_ERR "fb: xres %d yres %d\n", var.xres_virtual,
-              var.yres_virtual);
 
        if ((err = activate(fb_info, &var)))
                return err;
@@ -241,7 +239,7 @@ static ssize_t show_virtual(struct class_device *class_device, char *buf)
        struct fb_info *fb_info =
                (struct fb_info *)class_get_devdata(class_device);
        return snprintf(buf, PAGE_SIZE, "%d,%d\n", fb_info->var.xres_virtual,
-                       fb_info->var.xres_virtual);
+                       fb_info->var.yres_virtual);
 }
 
 static ssize_t store_cmap(struct class_device *class_device, const char * buf,
@@ -258,7 +256,7 @@ static ssize_t show_cmap(struct class_device *class_device, char *buf)
        unsigned int offset = 0, i;
 
        if (!fb_info->cmap.red || !fb_info->cmap.blue ||
-           fb_info->cmap.green || fb_info->cmap.transp)
+           !fb_info->cmap.green || !fb_info->cmap.transp)
                return -EINVAL;
 
        for (i = 0; i < fb_info->cmap.len; i++) {
@@ -354,7 +352,7 @@ static ssize_t show_pan(struct class_device *class_device, char *buf)
                        fb_info->var.xoffset);
 }
 
-struct class_device_attribute class_device_attrs[] = {
+static struct class_device_attribute class_device_attrs[] = {
        __ATTR(bits_per_pixel, S_IRUGO|S_IWUSR, show_bpp, store_bpp),
        __ATTR(blank, S_IRUGO|S_IWUSR, show_blank, store_blank),
        __ATTR(color_map, S_IRUGO|S_IWUSR, show_cmap, store_cmap),