diff options
-rw-r--r-- | Documentation/00-INDEX | 2 | ||||
-rw-r--r-- | Documentation/laptops/00-INDEX | 2 | ||||
-rw-r--r-- | Documentation/laptops/sonypi.txt (renamed from Documentation/sonypi.txt) | 0 | ||||
-rw-r--r-- | drivers/char/Kconfig | 2 |
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/ | |||
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 | sonypi.txt | ||
357 | - info on Linux Sony Programmable I/O Device support. | ||
358 | sound/ | 356 | sound/ |
359 | - directory with info on sound card support. | 357 | - directory with info on sound card support. |
360 | sparc/ | 358 | 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 @@ | |||
2 | - This file | 2 | - This file |
3 | sony-laptop.txt | 3 | sony-laptop.txt |
4 | - Sony Notebook Control Driver (SNC) Readme. | 4 | - Sony Notebook Control Driver (SNC) Readme. |
5 | sonypi.txt | ||
6 | - info on Linux Sony Programmable I/O Device support. | ||
5 | thinkpad-acpi.txt | 7 | thinkpad-acpi.txt |
6 | - information on the (IBM and Lenovo) ThinkPad ACPI Extras driver. | 8 | - 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 | |||
875 | Device which can be found in many (all ?) Sony Vaio laptops. | 875 | Device which can be found in many (all ?) Sony Vaio laptops. |
876 | 876 | ||
877 | If you have one of those laptops, read | 877 | If you have one of those laptops, read |
878 | <file:Documentation/sonypi.txt>, and say Y or M here. | 878 | <file:Documentation/laptops/sonypi.txt>, and say Y or M here. |
879 | 879 | ||
880 | To compile this driver as a module, choose M here: the | 880 | To compile this driver as a module, choose M here: the |
881 | module will be called sonypi. | 881 | module will be called sonypi. |