sonypi - Move sonypi.txt to Documentation/laptops

Also update references to sonypi.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>

4 files changed, 3 insertions, 3 deletions

diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX
index 012ef98d4e0a..8d556707bb68 100644
--- 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.
-sonypi.txt
-        - info on Linux Sony Programmable I/O Device support.
 sound/
         - directory with info on sound card support.
 sparc/
diff --git a/Documentation/laptops/00-INDEX b/Documentation/laptops/00-INDEX
index c5bac77d3576..dbe17595cc7f 100644
--- a/Documentation/laptops/00-INDEX
+++ b/Documentation/laptops/00-INDEX
@@ -2,5 +2,7 @@
         - This file
 sony-laptop.txt
         - Sony Notebook Control Driver (SNC) Readme.
+sonypi.txt
+        - info on Linux Sony Programmable I/O Device support.
 thinkpad-acpi.txt
         - information on the (IBM and Lenovo) ThinkPad ACPI Extras driver.
diff --git a/Documentation/sonypi.txt b/Documentation/laptops/sonypi.txt
index 4857acfc50f1..4857acfc50f1 100644
--- a/Documentation/sonypi.txt
+++ b/Documentation/laptops/sonypi.txt
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index f01ac9a07bf5..47c6be84fc84 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -875,7 +875,7 @@ config SONYPI
           Device which can be found in many (all ?) Sony Vaio laptops.
 
           If you have one of those laptops, read
-          <file:Documentation/sonypi.txt>, and say Y or M here.
+          <file:Documentation/laptops/sonypi.txt>, and say Y or M here.
 
           To compile this driver as a module, choose M here: the
           module will be called sonypi.