Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[linux-2.6-omap-h63xx.git] / drivers / misc / msi-laptop.c

diff --git a/drivers/misc/msi-laptop.c b/drivers/misc/msi-laptop.c
index 932a415197b3f636b5122f83c8472f4566fb1a75..de898c6938f37acd6194d27c3706c36b193716a5 100644 (file)
--- a/drivers/misc/msi-laptop.c
+++ b/drivers/misc/msi-laptop.c
@@ -58,7 +58,6 @@
 #include <linux/dmi.h>
 #include <linux/backlight.h>
 #include <linux/platform_device.h>
-#include <linux/autoconf.h>
 
 #define MSI_DRIVER_VERSION "0.5"
 
@@ -283,7 +282,7 @@ static struct platform_device *msipf_device;
 
 /* Initialization */
 
-static int dmi_check_cb(struct dmi_system_id *id)
+static int dmi_check_cb(const struct dmi_system_id *id)
 {
         printk("msi-laptop: Identified laptop model '%s'.\n", id->ident);
         return 0;
@@ -353,7 +352,7 @@ static int __init msi_init(void)
        if (IS_ERR(msibl_device))
                return PTR_ERR(msibl_device);
 
-       msibl_device->props.max_brightness = MSI_LCD_LEVEL_MAX-1,
+       msibl_device->props.max_brightness = MSI_LCD_LEVEL_MAX-1;
 
        ret = platform_driver_register(&msipf_driver);
        if (ret)