Jesse Keating 2f82dd
diff -up linux-2.6.32.noarch/drivers/platform/x86/thinkpad_acpi.c.orig linux-2.6.32.noarch/drivers/platform/x86/thinkpad_acpi.c
Jesse Keating 2f82dd
--- linux-2.6.32.noarch/drivers/platform/x86/thinkpad_acpi.c.orig	2010-05-17 16:18:05.748224844 -0400
Jesse Keating 2f82dd
+++ linux-2.6.32.noarch/drivers/platform/x86/thinkpad_acpi.c	2010-05-17 16:25:58.299199699 -0400
Jesse Keating 2f82dd
@@ -3387,7 +3387,7 @@ static int __init hotkey_init(struct ibm
Jesse Keating 2f82dd
 		/* update bright_acpimode... */
Jesse Keating 2f82dd
 		tpacpi_check_std_acpi_brightness_support();
Jesse Keating 2f82dd
 
Jesse Keating 2f82dd
-	if (tp_features.bright_acpimode && acpi_video_backlight_support()) {
Jesse Keating 2f82dd
+	if (acpi_video_backlight_support()) {
Jesse Keating 2f82dd
 		printk(TPACPI_INFO
Jesse Keating 2f82dd
 		       "This ThinkPad has standard ACPI backlight "
Jesse Keating 2f82dd
 		       "brightness control, supported by the ACPI "
Jesse Keating 2f82dd
@@ -6178,26 +6178,24 @@ static int __init brightness_init(struct
Jesse Keating 2f82dd
 	 * going to publish a backlight interface
Jesse Keating 2f82dd
 	 */
Jesse Keating 2f82dd
 	b = tpacpi_check_std_acpi_brightness_support();
Jesse Keating 2f82dd
-	if (b > 0) {
Jesse Keating 2f82dd
 
Jesse Keating 2f82dd
-		if (acpi_video_backlight_support()) {
Jesse Keating 2f82dd
-			if (brightness_enable > 1) {
Jesse Keating 2f82dd
-				printk(TPACPI_NOTICE
Jesse Keating 2f82dd
-				       "Standard ACPI backlight interface "
Jesse Keating 2f82dd
-				       "available, not loading native one.\n");
Jesse Keating 2f82dd
-				return 1;
Jesse Keating 2f82dd
-			} else if (brightness_enable == 1) {
Jesse Keating 2f82dd
-				printk(TPACPI_NOTICE
Jesse Keating 2f82dd
-				       "Backlight control force enabled, even if standard "
Jesse Keating 2f82dd
-				       "ACPI backlight interface is available\n");
Jesse Keating 2f82dd
-			}
Jesse Keating 2f82dd
-		} else {
Jesse Keating 2f82dd
-			if (brightness_enable > 1) {
Jesse Keating 2f82dd
-				printk(TPACPI_NOTICE
Jesse Keating 2f82dd
-				       "Standard ACPI backlight interface not "
Jesse Keating 2f82dd
-				       "available, thinkpad_acpi native "
Jesse Keating 2f82dd
-				       "brightness control enabled\n");
Jesse Keating 2f82dd
-			}
Jesse Keating 2f82dd
+	if (acpi_video_backlight_support()) {
Jesse Keating 2f82dd
+		if (brightness_enable > 1) {
Jesse Keating 2f82dd
+			printk(TPACPI_NOTICE
Jesse Keating 2f82dd
+			       "Standard ACPI backlight interface "
Jesse Keating 2f82dd
+			       "available, not loading native one.\n");
Jesse Keating 2f82dd
+			return 1;
Jesse Keating 2f82dd
+		} else if (brightness_enable == 1) {
Jesse Keating 2f82dd
+			printk(TPACPI_NOTICE
Jesse Keating 2f82dd
+			       "Backlight control force enabled, even if standard "
Jesse Keating 2f82dd
+			       "ACPI backlight interface is available\n");
Jesse Keating 2f82dd
+		}
Jesse Keating 2f82dd
+	} else {
Jesse Keating 2f82dd
+		if (brightness_enable > 1) {
Jesse Keating 2f82dd
+			printk(TPACPI_NOTICE
Jesse Keating 2f82dd
+			       "Standard ACPI backlight interface not "
Jesse Keating 2f82dd
+			       "available, thinkpad_acpi native "
Jesse Keating 2f82dd
+			       "brightness control enabled\n");
Jesse Keating 2f82dd
 		}
Jesse Keating 2f82dd
 	}
Jesse Keating 2f82dd