Browse Source

documentation: Move power-related files to Documentation/power/

Move 00-INDEX entries to power/00-INDEX (and add entry for
pm_qos_interface.txt).

Update references to moved filenames.

Fix some trailing whitespace.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Randy Dunlap 17 năm trước cách đây
mục cha
commit
53471121a8

+ 0 - 4
Documentation/00-INDEX

@@ -299,12 +299,8 @@ pcmcia/
 	- info on the Linux PCMCIA driver.
 	- info on the Linux PCMCIA driver.
 pi-futex.txt
 pi-futex.txt
 	- documentation on lightweight PI-futexes.
 	- documentation on lightweight PI-futexes.
-pm.txt
-	- info on Linux power management support.
 pnp.txt
 pnp.txt
 	- Linux Plug and Play documentation.
 	- Linux Plug and Play documentation.
-power_supply_class.txt
-	- Tells userspace about battery, UPS, AC or DC power supply properties
 power/
 power/
 	- directory with info on Linux PCI power management.
 	- directory with info on Linux PCI power management.
 powerpc/
 powerpc/

+ 1 - 1
Documentation/kernel-parameters.txt

@@ -138,7 +138,7 @@ and is between 256 and 4096 characters. It is defined in the file
 			strict -- Be less tolerant of platforms that are not
 			strict -- Be less tolerant of platforms that are not
 				strictly ACPI specification compliant.
 				strictly ACPI specification compliant.
 
 
-			See also Documentation/pm.txt, pci=noacpi
+			See also Documentation/power/pm.txt, pci=noacpi
 
 
 	acpi_apic_instance=	[ACPI, IOAPIC]
 	acpi_apic_instance=	[ACPI, IOAPIC]
 			Format: <int>
 			Format: <int>

+ 6 - 0
Documentation/power/00-INDEX

@@ -14,6 +14,12 @@ notifiers.txt
 	- Registering suspend notifiers in device drivers
 	- Registering suspend notifiers in device drivers
 pci.txt
 pci.txt
 	- How the PCI Subsystem Does Power Management
 	- How the PCI Subsystem Does Power Management
+pm.txt
+	- info on Linux power management support.
+pm_qos_interface.txt
+	- info on Linux PM Quality of Service interface
+power_supply_class.txt
+	- Tells userspace about battery, UPS, AC or DC power supply properties
 s2ram.txt
 s2ram.txt
 	- How to get suspend to ram working (and debug it when it isn't)
 	- How to get suspend to ram working (and debug it when it isn't)
 states.txt
 states.txt

+ 1 - 1
Documentation/pm.txt → Documentation/power/pm.txt

@@ -108,7 +108,7 @@ void pm_unregister_all(pm_callback cback);
  *          EINVAL if the request is not supported
  *          EINVAL if the request is not supported
  *          EBUSY if the device is now busy and cannot handle the request
  *          EBUSY if the device is now busy and cannot handle the request
  *          ENOMEM if the device was unable to handle the request due to memory
  *          ENOMEM if the device was unable to handle the request due to memory
- *          
+ *
  * Details: The device request callback will be called before the
  * Details: The device request callback will be called before the
  *          device/system enters a suspend state (ACPI D1-D3) or
  *          device/system enters a suspend state (ACPI D1-D3) or
  *          or after the device/system resumes from suspend (ACPI D0).
  *          or after the device/system resumes from suspend (ACPI D0).

+ 0 - 0
Documentation/pm_qos_interface.txt → Documentation/power/pm_qos_interface.txt


+ 0 - 0
Documentation/power_supply_class.txt → Documentation/power/power_supply_class.txt


+ 1 - 1
arch/x86/Kconfig

@@ -1259,7 +1259,7 @@ menuconfig APM
 	  machines with more than one CPU.
 	  machines with more than one CPU.
 
 
 	  In order to use APM, you will need supporting software. For location
 	  In order to use APM, you will need supporting software. For location
-	  and more information, read <file:Documentation/pm.txt> and the
+	  and more information, read <file:Documentation/power/pm.txt> and the
 	  Battery Powered Linux mini-HOWTO, available from
 	  Battery Powered Linux mini-HOWTO, available from
 	  <http://www.tldp.org/docs.html#howto>.
 	  <http://www.tldp.org/docs.html#howto>.
 
 

+ 1 - 1
kernel/power/Kconfig

@@ -190,7 +190,7 @@ config APM_EMULATION
 	  notification of APM "events" (e.g. battery status change).
 	  notification of APM "events" (e.g. battery status change).
 
 
 	  In order to use APM, you will need supporting software. For location
 	  In order to use APM, you will need supporting software. For location
-	  and more information, read <file:Documentation/pm.txt> and the
+	  and more information, read <file:Documentation/power/pm.txt> and the
 	  Battery Powered Linux mini-HOWTO, available from
 	  Battery Powered Linux mini-HOWTO, available from
 	  <http://www.tldp.org/docs.html#howto>.
 	  <http://www.tldp.org/docs.html#howto>.