diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 03:37:48 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:37:48 -0500 |
| commit | d0302bc62af7983040ea1cd1b5dd2b36e1a6a509 (patch) | |
| tree | ef45618ae057e21fff7c82190939fe5f4466cf06 /drivers/acpi | |
| parent | 106ad8d6b0a7c1a597fab56ec692c39f553fabbc (diff) | |
| parent | 237889bf0a62f1399fb2ba0c2a259e6a96597131 (diff) | |
| download | op-kernel-dev-d0302bc62af7983040ea1cd1b5dd2b36e1a6a509.zip op-kernel-dev-d0302bc62af7983040ea1cd1b5dd2b36e1a6a509.tar.gz | |
Merge branch 'misc' into release
Conflicts:
include/acpi/acpixf.h
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/acpica/tbutils.c | 3 | ||||
| -rw-r--r-- | drivers/acpi/pci_link.c | 4 | ||||
| -rw-r--r-- | drivers/acpi/video.c | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c index 3a8d8d2..9684cc8 100644 --- a/drivers/acpi/acpica/tbutils.c +++ b/drivers/acpi/acpica/tbutils.c @@ -445,7 +445,8 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags) /* Differentiate between RSDT and XSDT root tables */ - if (rsdp->revision > 1 && rsdp->xsdt_physical_address) { + if (rsdp->revision > 1 && rsdp->xsdt_physical_address + && !acpi_rsdt_forced) { /* * Root table is an XSDT (64-bit physical addresses). We must use the * XSDT if the revision is > 1 and the XSDT pointer is present, as per diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index 4869fa1..1c6e73c 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c @@ -796,10 +796,6 @@ static int irqrouter_resume(struct sys_device *dev) struct list_head *node = NULL; struct acpi_pci_link *link = NULL; - - /* Make sure SCI is enabled again (Apple firmware bug?) */ - acpi_set_register(ACPI_BITREG_SCI_ENABLE, 1); - list_for_each(node, &acpi_link.entries) { link = list_entry(node, struct acpi_pci_link, node); if (!link) { diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 38bf8b4..f261737 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -482,6 +482,7 @@ acpi_video_device_lcd_set_level(struct acpi_video_device *device, int level) int status = AE_OK; union acpi_object arg0 = { ACPI_TYPE_INTEGER }; struct acpi_object_list args = { 1, &arg0 }; + int state; arg0.integer.value = level; @@ -490,6 +491,10 @@ acpi_video_device_lcd_set_level(struct acpi_video_device *device, int level) status = acpi_evaluate_object(device->dev->handle, "_BCM", &args, NULL); device->brightness->curr = level; + for (state = 2; state < device->brightness->count; state++) + if (level == device->brightness->levels[state]) + device->backlight->props.brightness = state - 2; + return status; } |
