linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / video / backlight / backlight.c

diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
index 23bd9ee..151fda8 100644 (file)
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
@@ -5,7 +5,6 @@
  *
  */
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/device.h>
@@ -14,7 +13,6 @@
 #include <linux/ctype.h>
 #include <linux/err.h>
 #include <linux/fb.h>
-#include <asm/bug.h>
 
 static ssize_t backlight_show_power(struct class_device *cdev, char *buf)
 {
@@ -111,7 +109,7 @@ static void backlight_class_release(struct class_device *dev)
        kfree(bd);
 }
 
-struct class backlight_class = {
+static struct class backlight_class = {
        .name = "backlight",
        .release = backlight_class_release,
 };
@@ -174,7 +172,7 @@ struct backlight_device *backlight_device_register(const char *name, void *devda
 
        new_bd = kmalloc(sizeof(struct backlight_device), GFP_KERNEL);
        if (unlikely(!new_bd))
-               return ERR_PTR(ENOMEM);
+               return ERR_PTR(-ENOMEM);
 
        init_MUTEX(&new_bd->sem);
        new_bd->props = bp;