aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-08-15 15:56:23 -0400
committerLen Brown <len.brown@intel.com>2005-08-15 15:56:23 -0400
commitcb220c1af49644786944c549518b491d4c654030 (patch)
tree9e0f95049de550b0e5f59a5f62ad9089997b6815 /Documentation
parent1dadb3dadfaa01890fc10df03f0dd03a9f8774b2 (diff)
parentf6869979bec3cc2efddc7359f30ba37642084fb7 (diff)
Merge 'acpi-2.6.12' branch into to-akpm
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/acpi-hotkey.txt4
-rw-r--r--Documentation/kernel-parameters.txt5
2 files changed, 7 insertions, 2 deletions
diff --git a/Documentation/acpi-hotkey.txt b/Documentation/acpi-hotkey.txt
index d57b02a4746b..744f1aec6553 100644
--- a/Documentation/acpi-hotkey.txt
+++ b/Documentation/acpi-hotkey.txt
@@ -34,5 +34,5 @@ attached to /proc/acpi/hotkey/poll_method, which is dnyamically
34created. Please use command "cat /proc/acpi/hotkey/polling_method" 34created. Please use command "cat /proc/acpi/hotkey/polling_method"
35to retrieve it. 35to retrieve it.
36 36
37Note: Use cmdline "acpi_specific_hotkey" to enable legacy platform 37Note: Use cmdline "acpi_generic_hotkey" to over-ride
38specific drivers. 38platform-specific with generic driver.
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index a998a8c2f95b..3d5cd7a09b2f 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -159,6 +159,11 @@ running once the system is up.
159 159
160 acpi_fake_ecdt [HW,ACPI] Workaround failure due to BIOS lacking ECDT 160 acpi_fake_ecdt [HW,ACPI] Workaround failure due to BIOS lacking ECDT
161 161
162 acpi_generic_hotkey [HW,ACPI]
163 Allow consolidated generic hotkey driver to
164 over-ride platform specific driver.
165 See also Documentation/acpi-hotkey.txt.
166
162 ad1816= [HW,OSS] 167 ad1816= [HW,OSS]
163 Format: <io>,<irq>,<dma>,<dma2> 168 Format: <io>,<irq>,<dma>,<dma2>
164 See also Documentation/sound/oss/AD1816. 169 See also Documentation/sound/oss/AD1816.