diff options
author | Carlos Corbacho <carlos@strangeworlds.co.uk> | 2008-02-08 20:32:14 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-02-09 04:15:40 -0500 |
commit | f04b7c402ba587a299e62907a457013914dec477 (patch) | |
tree | 3743f4b5cdb3d4d6a8adac85305dc5e0d36c3c4f | |
parent | f191dc6b55cf92eb8e1f48b41533ecf4d6161569 (diff) |
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-INDEX | 2 | ||||
-rw-r--r-- | Documentation/laptops/00-INDEX | 2 | ||||
-rw-r--r-- | Documentation/laptops/sony-laptop.txt (renamed from Documentation/sony-laptop.txt) | 1 | ||||
-rw-r--r-- | drivers/misc/Kconfig | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX index d69b2a3cb455..012ef98d4e0a 100644 --- a/Documentation/00-INDEX +++ b/Documentation/00-INDEX | |||
@@ -353,8 +353,6 @@ sh/ | |||
353 | - directory with info on porting Linux to a new architecture. | 353 | - directory with info on porting Linux to a new architecture. |
354 | smart-config.txt | 354 | smart-config.txt |
355 | - description of the Smart Config makefile feature. | 355 | - description of the Smart Config makefile feature. |
356 | sony-laptop.txt | ||
357 | - Sony Notebook Control Driver (SNC) Readme. | ||
358 | sonypi.txt | 356 | sonypi.txt |
359 | - info on Linux Sony Programmable I/O Device support. | 357 | - info on Linux Sony Programmable I/O Device support. |
360 | sound/ | 358 | sound/ |
diff --git a/Documentation/laptops/00-INDEX b/Documentation/laptops/00-INDEX index e806b084e5b2..c5bac77d3576 100644 --- a/Documentation/laptops/00-INDEX +++ b/Documentation/laptops/00-INDEX | |||
@@ -1,4 +1,6 @@ | |||
1 | 00-INDEX | 1 | 00-INDEX |
2 | - This file | 2 | - This file |
3 | sony-laptop.txt | ||
4 | - Sony Notebook Control Driver (SNC) Readme. | ||
3 | thinkpad-acpi.txt | 5 | thinkpad-acpi.txt |
4 | - information on the (IBM and Lenovo) ThinkPad ACPI Extras driver. | 6 | - information on the (IBM and Lenovo) ThinkPad ACPI Extras driver. |
diff --git a/Documentation/sony-laptop.txt b/Documentation/laptops/sony-laptop.txt index 7a5c1a81905c..8b2bc1572d98 100644 --- a/Documentation/sony-laptop.txt +++ b/Documentation/laptops/sony-laptop.txt | |||
@@ -114,4 +114,3 @@ Bugs/Limitations: | |||
114 | sonypi driver (through /dev/sonypi) does not try to use the | 114 | sonypi driver (through /dev/sonypi) does not try to use the |
115 | sony-laptop driver. In the future, spicctrl could try sonypi first, | 115 | sony-laptop driver. In the future, spicctrl could try sonypi first, |
116 | and if it isn't present, try sony-laptop instead. | 116 | and if it isn't present, try sony-laptop instead. |
117 | |||
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 85ee4362f2db..830f51c0ff79 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig | |||
@@ -192,7 +192,7 @@ config SONY_LAPTOP | |||
192 | screen brightness control, Fn keys and allows powering on/off some | 192 | screen brightness control, Fn keys and allows powering on/off some |
193 | devices. | 193 | devices. |
194 | 194 | ||
195 | Read <file:Documentation/sony-laptop.txt> for more information. | 195 | Read <file:Documentation/laptops/sony-laptop.txt> for more information. |
196 | 196 | ||
197 | config SONYPI_COMPAT | 197 | config SONYPI_COMPAT |
198 | bool "Sonypi compatibility" | 198 | bool "Sonypi compatibility" |