Merge 'acpi-2.6.12' branch into to-akpm

This commit is contained in:
Len Brown
2005-08-15 15:56:23 -04:00
3 changed files with 10 additions and 5 deletions

View File

@@ -34,5 +34,5 @@ attached to /proc/acpi/hotkey/poll_method, which is dnyamically
created. Please use command "cat /proc/acpi/hotkey/polling_method"
to retrieve it.
Note: Use cmdline "acpi_specific_hotkey" to enable legacy platform
specific drivers.
Note: Use cmdline "acpi_generic_hotkey" to over-ride
platform-specific with generic driver.

View File

@@ -159,6 +159,11 @@ running once the system is up.
acpi_fake_ecdt [HW,ACPI] Workaround failure due to BIOS lacking ECDT
acpi_generic_hotkey [HW,ACPI]
Allow consolidated generic hotkey driver to
over-ride platform specific driver.
See also Documentation/acpi-hotkey.txt.
ad1816= [HW,OSS]
Format: <io>,<irq>,<dma>,<dma2>
See also Documentation/sound/oss/AD1816.