diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-07-21 00:55:14 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-07-21 00:55:14 -0400 |
| commit | 908cf4b925e419bc74f3297b2f0e51d6f8a81da2 (patch) | |
| tree | 6c2da79366d4695a9c2560ab18259eca8a2a25b4 /Documentation/auxdisplay | |
| parent | 92c49890922d54cba4b1eadeb0b185773c2c9570 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
Diffstat (limited to 'Documentation/auxdisplay')
| -rw-r--r-- | Documentation/auxdisplay/cfag12864b | 4 | ||||
| -rw-r--r-- | Documentation/auxdisplay/cfag12864b-example.c | 2 | ||||
| -rw-r--r-- | Documentation/auxdisplay/ks0108 | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/auxdisplay/cfag12864b b/Documentation/auxdisplay/cfag12864b index b714183d412..eb7be393a51 100644 --- a/Documentation/auxdisplay/cfag12864b +++ b/Documentation/auxdisplay/cfag12864b | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | =================================== | 3 | =================================== |
| 4 | 4 | ||
| 5 | License: GPLv2 | 5 | License: GPLv2 |
| 6 | Author & Maintainer: Miguel Ojeda Sandonis <maxextreme@gmail.com> | 6 | Author & Maintainer: Miguel Ojeda Sandonis |
| 7 | Date: 2006-10-27 | 7 | Date: 2006-10-27 |
| 8 | 8 | ||
| 9 | 9 | ||
| @@ -22,7 +22,7 @@ Date: 2006-10-27 | |||
| 22 | 1. DRIVER INFORMATION | 22 | 1. DRIVER INFORMATION |
| 23 | --------------------- | 23 | --------------------- |
| 24 | 24 | ||
| 25 | This driver support one cfag12864b display at time. | 25 | This driver supports a cfag12864b LCD. |
| 26 | 26 | ||
| 27 | 27 | ||
| 28 | --------------------- | 28 | --------------------- |
diff --git a/Documentation/auxdisplay/cfag12864b-example.c b/Documentation/auxdisplay/cfag12864b-example.c index 7bfac354d4c..2caeea5e499 100644 --- a/Documentation/auxdisplay/cfag12864b-example.c +++ b/Documentation/auxdisplay/cfag12864b-example.c | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * Description: cfag12864b LCD userspace example program | 4 | * Description: cfag12864b LCD userspace example program |
| 5 | * License: GPLv2 | 5 | * License: GPLv2 |
| 6 | * | 6 | * |
| 7 | * Author: Copyright (C) Miguel Ojeda Sandonis <maxextreme@gmail.com> | 7 | * Author: Copyright (C) Miguel Ojeda Sandonis |
| 8 | * Date: 2006-10-31 | 8 | * Date: 2006-10-31 |
| 9 | * | 9 | * |
| 10 | * This program is free software; you can redistribute it and/or modify | 10 | * This program is free software; you can redistribute it and/or modify |
diff --git a/Documentation/auxdisplay/ks0108 b/Documentation/auxdisplay/ks0108 index 92b03b60c61..8ddda0c8cee 100644 --- a/Documentation/auxdisplay/ks0108 +++ b/Documentation/auxdisplay/ks0108 | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | ========================================== | 3 | ========================================== |
| 4 | 4 | ||
| 5 | License: GPLv2 | 5 | License: GPLv2 |
| 6 | Author & Maintainer: Miguel Ojeda Sandonis <maxextreme@gmail.com> | 6 | Author & Maintainer: Miguel Ojeda Sandonis |
| 7 | Date: 2006-10-27 | 7 | Date: 2006-10-27 |
| 8 | 8 | ||
| 9 | 9 | ||
| @@ -21,7 +21,7 @@ Date: 2006-10-27 | |||
| 21 | 1. DRIVER INFORMATION | 21 | 1. DRIVER INFORMATION |
| 22 | --------------------- | 22 | --------------------- |
| 23 | 23 | ||
| 24 | This driver support the ks0108 LCD controller. | 24 | This driver supports the ks0108 LCD controller. |
| 25 | 25 | ||
| 26 | 26 | ||
| 27 | --------------------- | 27 | --------------------- |