sony-laptop - Move sony-laptop.txt to Documentation/laptops

Also update references to sony-laptop.txt in Kconfig.

Signed-off-by: Carlos Corbacho <carlos@strangeworlds.co.uk>
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
CC: Mattia Dongili <malattia@linux.it>
Signed-off-by: Len Brown <len.brown@intel.com>

diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX
index d69b2a3cb455a091f9210170d74eaf55470535ba..012ef98d4e0a613b67e0aa60041db896a5000c23 100644 (file)
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
@@ -353,8 +353,6 @@ sh/
        - directory with info on porting Linux to a new architecture.
 smart-config.txt
        - description of the Smart Config makefile feature.
-sony-laptop.txt
-       - Sony Notebook Control Driver (SNC) Readme.
 sonypi.txt
        - info on Linux Sony Programmable I/O Device support.
 sound/

diff --git a/Documentation/laptops/00-INDEX b/Documentation/laptops/00-INDEX
index e806b084e5b21cbe225303ca5c77152ddd791c31..c5bac77d3576deee57a105c219f370cd7bf8fbba 100644 (file)
--- a/Documentation/laptops/00-INDEX
+++ b/Documentation/laptops/00-INDEX
@@ -1,4 +1,6 @@
 00-INDEX
        - This file
+sony-laptop.txt
+       - Sony Notebook Control Driver (SNC) Readme.
 thinkpad-acpi.txt
        - information on the (IBM and Lenovo) ThinkPad ACPI Extras driver.

diff --git a/Documentation/sony-laptop.txt b/Documentation/laptops/sony-laptop.txt
similarity index 99%
rename from Documentation/sony-laptop.txt
rename to Documentation/laptops/sony-laptop.txt
index 7a5c1a81905c66940fe2c3a2d516b237f957b970..8b2bc1572d98eae5fe8e2c78dd0be77bee1d9326 100644 (file)
--- a/Documentation/sony-laptop.txt
+++ b/Documentation/laptops/sony-laptop.txt
@@ -114,4 +114,3 @@ Bugs/Limitations:
   sonypi driver (through /dev/sonypi) does not try to use the
   sony-laptop driver. In the future, spicctrl could try sonypi first,
   and if it isn't present, try sony-laptop instead.
-

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 85ee4362f2db6031f987e06551b28b7049da0fec..830f51c0ff79c388abad27de787877253c693a54 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -192,7 +192,7 @@ config SONY_LAPTOP
          screen brightness control, Fn keys and allows powering on/off some
          devices.
 
-         Read <file:Documentation/sony-laptop.txt> for more information.
+         Read <file:Documentation/laptops/sony-laptop.txt> for more information.
 
 config SONYPI_COMPAT
        bool "Sonypi compatibility"