aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Corbacho <carlos@strangeworlds.co.uk>2008-02-09 01:32:14 +0000
committerLen Brown <len.brown@intel.com>2008-02-09 04:15:40 -0500
commitf04b7c402ba587a299e62907a457013914dec477 (patch)
tree3743f4b5cdb3d4d6a8adac85305dc5e0d36c3c4f
parentf191dc6b55cf92eb8e1f48b41533ecf4d6161569 (diff)
downloadmrst-s0i3-test-f04b7c402ba587a299e62907a457013914dec477.tar.gz
mrst-s0i3-test-f04b7c402ba587a299e62907a457013914dec477.tar.xz
mrst-s0i3-test-f04b7c402ba587a299e62907a457013914dec477.zip
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>
-rw-r--r--Documentation/00-INDEX2
-rw-r--r--Documentation/laptops/00-INDEX2
-rw-r--r--Documentation/laptops/sony-laptop.txt (renamed from Documentation/sony-laptop.txt)1
-rw-r--r--drivers/misc/Kconfig2
4 files changed, 3 insertions, 4 deletions
diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX
index d69b2a3cb45..012ef98d4e0 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.
-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 e806b084e5b..c5bac77d357 100644
--- 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
index 7a5c1a81905..8b2bc1572d9 100644
--- 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 85ee4362f2d..830f51c0ff7 100644
--- 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"