Jiri Slaby wrote:
> Corentin CHARY napsal(a):
>> Le Wednesday 11 April 2007 11:33:48 Jiri Slaby, vous avez écrit :
>>> asus_acpi, support F2JE model
>> Just use the new asus-laptop driver =)
>> (see acpi4asus-0.40)
> 
> code seems good, but this is not so good:
> #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
> #warning "This module does not support 2.6.20 yet, wait for a new release
> #=)" endif
>
> When do you plan to support latest kernels and merge it to mainline?

This patch fixes acpi4asus-0.40 for me at least with 2.6.20 on a ASUS R1F.

Danny

Signed-off-by: Danny Kukawka <[EMAIL PROTECTED]>
---
 asus-laptop.c |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

--- acpi4asus-0.40/driver/asus-laptop.c 2007-02-13 17:42:51.000000000 +0100
+++ acpi4asus-0.40/driver/asus-laptop.c 2007-04-11 20:12:49.000000000 +0200
@@ -41,8 +41,8 @@
 # include <linux/autoconf.h>
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
-#warning "This module does not support 2.6.20 yet, wait for a new release =)"
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
+#warning "This module does not support 2.6.21 yet, wait for a new release =)"
 #endif
 
 #include <linux/kernel.h>
@@ -226,8 +226,8 @@
        static void object##_led_set(struct led_classdev *led_cdev,     \
                                     enum led_brightness value);        \
        static int object##_led_wk;                                     \
-       static void object##_led_update(void *data);                    \
-        DECLARE_WORK(object##_led_work, object##_led_update, NULL);    \
+       static void object##_led_update(struct work_struct *dummy);     \
+        DECLARE_WORK(object##_led_work, object##_led_update);          \
        static struct led_classdev object##_led = {                     \
                .name           = "asus:" ledname,                      \
                .brightness_set = object##_led_set,                     \
@@ -329,7 +329,7 @@
                object##_led_wk = value;                                \
                queue_work(led_workqueue, &object##_led_work);          \
        }                                                               \
-       static void object##_led_update(void * data)                    \
+       static void object##_led_update(struct work_struct *dummy)      \
        {                                                               \
                int value = object##_led_wk;                            \
                write_status(object##_set_handle, value, (mask));       \
@@ -1053,8 +1053,7 @@
        struct backlight_device *bd;
 
        if(brightness_set_handle && lcd_switch_handle) {
-               bd = backlight_device_register (ASUS_HOTK_FILE, NULL,
-                                               &asusbl_data);
+               bd = backlight_device_register (ASUS_HOTK_FILE, NULL, NULL, 
&asusbl_data);
 
                if (IS_ERR (bd)) {
                        printk(ASUS_ERR
-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to