diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-23 04:52:33 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-23 04:52:33 -0500 |
| commit | 9f1441644213e5f6faa150206399fe511eba2eb6 (patch) | |
| tree | e59d4e6475aa84f7e821a8c607deb56b85e19e95 /drivers/misc/eeepc-laptop.c | |
| parent | 3ff68a6a106c362a6811d3e51bced58e6fc87de7 (diff) | |
| parent | 13d428afc007fcfcd6deeb215618f54cf9c0cae6 (diff) | |
Merge commit 'v2.6.28-rc6' into irq/urgent
Diffstat (limited to 'drivers/misc/eeepc-laptop.c')
| -rw-r--r-- | drivers/misc/eeepc-laptop.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/misc/eeepc-laptop.c b/drivers/misc/eeepc-laptop.c index 9ef98b2d5039..02fe2b8b8939 100644 --- a/drivers/misc/eeepc-laptop.c +++ b/drivers/misc/eeepc-laptop.c | |||
| @@ -825,9 +825,15 @@ static int __init eeepc_laptop_init(void) | |||
| 825 | return -ENODEV; | 825 | return -ENODEV; |
| 826 | } | 826 | } |
| 827 | dev = acpi_get_physical_device(ehotk->device->handle); | 827 | dev = acpi_get_physical_device(ehotk->device->handle); |
| 828 | result = eeepc_backlight_init(dev); | 828 | |
| 829 | if (result) | 829 | if (!acpi_video_backlight_support()) { |
| 830 | goto fail_backlight; | 830 | result = eeepc_backlight_init(dev); |
| 831 | if (result) | ||
| 832 | goto fail_backlight; | ||
| 833 | } else | ||
| 834 | printk(EEEPC_INFO "Backlight controlled by ACPI video " | ||
| 835 | "driver\n"); | ||
| 836 | |||
| 831 | result = eeepc_hwmon_init(dev); | 837 | result = eeepc_hwmon_init(dev); |
| 832 | if (result) | 838 | if (result) |
| 833 | goto fail_hwmon; | 839 | goto fail_hwmon; |