Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (47 commits)
  ACPI: pci_link: remove acpi_irq_balance_set() interface
  fujitsu-laptop: Add DMI callback for Lifebook S6420
  ACPI: EC: Don't do transaction from GPE handler in poll mode.
  ACPI: EC: lower interrupt storm treshold
  ACPICA: Use spinlock for acpi_{en|dis}able_gpe
  ACPI: EC: restart failed command
  ACPI: EC: wait for last write gpe
  ACPI: EC: make kernel messages more useful when GPE storm is detected
  ACPI: EC: revert msleep patch
  thinkpad_acpi: fingers off backlight if video.ko is serving this functionality
  sony-laptop: fingers off backlight if video.ko is serving this functionality
  msi-laptop: fingers off backlight if video.ko is serving this functionality
  fujitsu-laptop: fingers off backlight if video.ko is serving this functionality
  eeepc-laptop: fingers off backlight if video.ko is serving this functionality
  compal: fingers off backlight if video.ko is serving this functionality
  asus-acpi: fingers off backlight if video.ko is serving this functionality
  Acer-WMI: fingers off backlight if video.ko is serving this functionality
  ACPI video: if no ACPI backlight support, use vendor drivers
  ACPI: video: Ignore devices that aren't present in hardware
  Delete an unwanted return statement at evgpe.c
  ...

1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/misc/compal-laptop.c b/drivers/misc/compal-laptop.c
index 344b790a625..11003bba10d 100644
--- a/drivers/misc/compal-laptop.c
+++ b/drivers/misc/compal-laptop.c
@@ -326,12 +326,14 @@ static int __init compal_init(void)
 
         /* Register backlight stuff */
 
-        compalbl_device = backlight_device_register("compal-laptop", NULL, NULL,
-                                                &compalbl_ops);
-        if (IS_ERR(compalbl_device))
-                return PTR_ERR(compalbl_device);
+        if (!acpi_video_backlight_support()) {
+                compalbl_device = backlight_device_register("compal-laptop", NULL, NULL,
+                                                            &compalbl_ops);
+                if (IS_ERR(compalbl_device))
+                        return PTR_ERR(compalbl_device);
 
-        compalbl_device->props.max_brightness = COMPAL_LCD_LEVEL_MAX-1;
+                compalbl_device->props.max_brightness = COMPAL_LCD_LEVEL_MAX-1;
+        }
 
         ret = platform_driver_register(&compal_driver);
         if (ret)