1 files changed, 11 insertions, 0 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index f6a3961da349..c479d30eeaa3 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -48,6 +48,7 @@ parameter is applicable:
         ISAPNP  ISA PnP code is enabled.
         ISDN    Appropriate ISDN support is enabled.
         JOY     Appropriate joystick support is enabled.
+        LIBATA  Libata driver is enabled
         LP      Printer support is enabled.
         LOOP    Loopback device support is enabled.
         M68k    M68k architecture is enabled.
@@ -1045,6 +1046,10 @@ and is between 256 and 4096 characters. It is defined in the file
                         emulation library even if a 387 maths coprocessor
                         is present.
 
+        noacpi          [LIBATA] Disables use of ACPI in libata suspend/resume
+                        when set.
+                        Format: <int>
+
         noaliencache    [MM, NUMA] Disables the allcoation of alien caches in
                         the slab allocator.  Saves per-node memory, but will
                         impact performance on real NUMA hardware.
@@ -1282,6 +1287,12 @@ and is between 256 and 4096 characters. It is defined in the file
                                 This sorting is done to get a device
                                 order compatible with older (<= 2.4) kernels.
                 nobfsort        Don't sort PCI devices into breadth-first order.
+                cbiosize=nn[KMG]        The fixed amount of bus space which is
+                                reserved for the CardBus bridge's IO window.
+                                The default value is 256 bytes.
+                cbmemsize=nn[KMG]       The fixed amount of bus space which is
+                                reserved for the CardBus bridge's memory
+                                window. The default value is 64 megabytes.
 
         pcmv=           [HW,PCMCIA] BadgePAD 4