diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 23:36:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 23:36:17 -0400 |
commit | c00046c279a2521075250fad682ca0acc10d4fd7 (patch) | |
tree | 78a7e9089c26f199ad9b0161bb564b7c1ca6daf9 /drivers/video | |
parent | 9abbf7d028b1598b40ebdc81c48f30da7f3d5bf5 (diff) | |
parent | 8e8a1407ac23b43cec0412338c1b4f5e1c664550 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (74 commits)
fix do_sys_open() prototype
sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistake
Documentation: Fix typo in SubmitChecklist.
Typo: depricated -> deprecated
Add missing profile=kvm option to Documentation/kernel-parameters.txt
fix typo about TBI in e1000 comment
proc.txt: Add /proc/stat field
small documentation fixes
Fix compiler warning in smount example program from sharedsubtree.txt
docs/sysfs: add missing word to sysfs attribute explanation
documentation/ext3: grammar fixes
Documentation/java.txt: typo and grammar fixes
Documentation/filesystems/vfs.txt: typo fix
include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros
trivial copy_data_pages() tidy up
Fix typo in arch/x86/kernel/tsc_32.c
file link fix for Pegasus USB net driver help
remove unused return within void return function
Typo fixes retrun -> return
x86 hpet.h: remove broken links
...
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/Kconfig | 6 | ||||
-rw-r--r-- | drivers/video/amifb.c | 14 | ||||
-rw-r--r-- | drivers/video/aty/atyfb_base.c | 2 | ||||
-rw-r--r-- | drivers/video/console/Kconfig | 2 | ||||
-rw-r--r-- | drivers/video/intelfb/intelfbdrv.c | 2 | ||||
-rw-r--r-- | drivers/video/intelfb/intelfbhw.c | 2 | ||||
-rw-r--r-- | drivers/video/omap/Kconfig | 2 | ||||
-rw-r--r-- | drivers/video/s3c2410fb.c | 4 | ||||
-rw-r--r-- | drivers/video/vermilion/vermilion.c | 4 | ||||
-rw-r--r-- | drivers/video/vermilion/vermilion.h | 2 |
10 files changed, 20 insertions, 20 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index b3bf4ecc983a..fb9d8d0b2c04 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
@@ -661,7 +661,7 @@ config FB_HECUBA | |||
661 | help | 661 | help |
662 | This enables support for the Hecuba board. This driver was tested | 662 | This enables support for the Hecuba board. This driver was tested |
663 | with an E-Ink 800x600 display and x86 SBCs through a 16 bit GPIO | 663 | with an E-Ink 800x600 display and x86 SBCs through a 16 bit GPIO |
664 | interface (8 bit data, 4 bit control). If you anticpate using | 664 | interface (8 bit data, 4 bit control). If you anticipate using |
665 | this driver, say Y or M; otherwise say N. You must specify the | 665 | this driver, say Y or M; otherwise say N. You must specify the |
666 | GPIO IO address to be used for setting control and data. | 666 | GPIO IO address to be used for setting control and data. |
667 | 667 | ||
@@ -815,7 +815,7 @@ config FB_XVR500 | |||
815 | help | 815 | help |
816 | This is the framebuffer device for the Sun XVR-500 and similar | 816 | This is the framebuffer device for the Sun XVR-500 and similar |
817 | graphics cards based upon the 3DLABS Wildcat chipset. The driver | 817 | graphics cards based upon the 3DLABS Wildcat chipset. The driver |
818 | only works on sparc64 systems where the system firwmare has | 818 | only works on sparc64 systems where the system firmware has |
819 | mostly initialized the card already. It is treated as a | 819 | mostly initialized the card already. It is treated as a |
820 | completely dumb framebuffer device. | 820 | completely dumb framebuffer device. |
821 | 821 | ||
@@ -828,7 +828,7 @@ config FB_XVR2500 | |||
828 | help | 828 | help |
829 | This is the framebuffer device for the Sun XVR-2500 and similar | 829 | This is the framebuffer device for the Sun XVR-2500 and similar |
830 | graphics cards based upon the 3DLABS Wildcat chipset. The driver | 830 | graphics cards based upon the 3DLABS Wildcat chipset. The driver |
831 | only works on sparc64 systems where the system firwmare has | 831 | only works on sparc64 systems where the system firmware has |
832 | mostly initialized the card already. It is treated as a | 832 | mostly initialized the card already. It is treated as a |
833 | completely dumb framebuffer device. | 833 | completely dumb framebuffer device. |
834 | 834 | ||
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c index f2e243c353f9..4c9ec3f58c52 100644 --- a/drivers/video/amifb.c +++ b/drivers/video/amifb.c | |||
@@ -112,7 +112,7 @@ | |||
112 | +----------+---------------------------------------------+----------+-------+ | 112 | +----------+---------------------------------------------+----------+-------+ |
113 | | | ^ | | | | 113 | | | ^ | | | |
114 | | | |upper_margin | | | | 114 | | | |upper_margin | | | |
115 | | | � | | | | 115 | | | v | | | |
116 | +----------###############################################----------+-------+ | 116 | +----------###############################################----------+-------+ |
117 | | # ^ # | | | 117 | | # ^ # | | |
118 | | # | # | | | 118 | | # | # | | |
@@ -133,15 +133,15 @@ | |||
133 | | # | # | | | 133 | | # | # | | |
134 | | # | # | | | 134 | | # | # | | |
135 | | # | # | | | 135 | | # | # | | |
136 | | # � # | | | 136 | | # v # | | |
137 | +----------###############################################----------+-------+ | 137 | +----------###############################################----------+-------+ |
138 | | | ^ | | | | 138 | | | ^ | | | |
139 | | | |lower_margin | | | | 139 | | | |lower_margin | | | |
140 | | | � | | | | 140 | | | v | | | |
141 | +----------+---------------------------------------------+----------+-------+ | 141 | +----------+---------------------------------------------+----------+-------+ |
142 | | | ^ | | | | 142 | | | ^ | | | |
143 | | | |vsync_len | | | | 143 | | | |vsync_len | | | |
144 | | | � | | | | 144 | | | v | | | |
145 | +----------+---------------------------------------------+----------+-------+ | 145 | +----------+---------------------------------------------+----------+-------+ |
146 | 146 | ||
147 | 147 | ||
@@ -325,7 +325,7 @@ | |||
325 | CCIR -> PAL | 325 | CCIR -> PAL |
326 | ----------- | 326 | ----------- |
327 | 327 | ||
328 | - a scanline is 64 �s long, of which 52.48 �s are visible. This is about | 328 | - a scanline is 64 ��s long, of which 52.48 ��s are visible. This is about |
329 | 736 visible 70 ns pixels per line. | 329 | 736 visible 70 ns pixels per line. |
330 | - we have 625 scanlines, of which 575 are visible (interlaced); after | 330 | - we have 625 scanlines, of which 575 are visible (interlaced); after |
331 | rounding this becomes 576. | 331 | rounding this becomes 576. |
@@ -333,7 +333,7 @@ | |||
333 | RETMA -> NTSC | 333 | RETMA -> NTSC |
334 | ------------- | 334 | ------------- |
335 | 335 | ||
336 | - a scanline is 63.5 �s long, of which 53.5 �s are visible. This is about | 336 | - a scanline is 63.5 ��s long, of which 53.5 ��s are visible. This is about |
337 | 736 visible 70 ns pixels per line. | 337 | 736 visible 70 ns pixels per line. |
338 | - we have 525 scanlines, of which 485 are visible (interlaced); after | 338 | - we have 525 scanlines, of which 485 are visible (interlaced); after |
339 | rounding this becomes 484. | 339 | rounding this becomes 484. |
@@ -802,7 +802,7 @@ static u_short ecs_palette[32]; | |||
802 | 802 | ||
803 | static u_short do_vmode_full = 0; /* Change the Video Mode */ | 803 | static u_short do_vmode_full = 0; /* Change the Video Mode */ |
804 | static u_short do_vmode_pan = 0; /* Update the Video Mode */ | 804 | static u_short do_vmode_pan = 0; /* Update the Video Mode */ |
805 | static short do_blank = 0; /* (Un)Blank the Screen (�1) */ | 805 | static short do_blank = 0; /* (Un)Blank the Screen (��1) */ |
806 | static u_short do_cursor = 0; /* Move the Cursor */ | 806 | static u_short do_cursor = 0; /* Move the Cursor */ |
807 | 807 | ||
808 | 808 | ||
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index abe0c435a664..d775eb6590b6 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
@@ -26,7 +26,7 @@ | |||
26 | * Anthony Tong <atong@uiuc.edu> | 26 | * Anthony Tong <atong@uiuc.edu> |
27 | * | 27 | * |
28 | * Generic LCD support written by Daniel Mantione, ported from 2.4.20 by Alex Kern | 28 | * Generic LCD support written by Daniel Mantione, ported from 2.4.20 by Alex Kern |
29 | * Many Thanks to Ville Syrj�l� for patches and fixing nasting 16 bit color bug. | 29 | * Many Thanks to Ville Syrjälä for patches and fixing nasting 16 bit color bug. |
30 | * | 30 | * |
31 | * This file is subject to the terms and conditions of the GNU General Public | 31 | * This file is subject to the terms and conditions of the GNU General Public |
32 | * License. See the file COPYING in the main directory of this archive for | 32 | * License. See the file COPYING in the main directory of this archive for |
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index a22ccf9485a4..267422f66255 100644 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig | |||
@@ -27,7 +27,7 @@ config VGACON_SOFT_SCROLLBACK | |||
27 | The scrollback buffer of the standard VGA console is located in | 27 | The scrollback buffer of the standard VGA console is located in |
28 | the VGA RAM. The size of this RAM is fixed and is quite small. | 28 | the VGA RAM. The size of this RAM is fixed and is quite small. |
29 | If you require a larger scrollback buffer, this can be placed in | 29 | If you require a larger scrollback buffer, this can be placed in |
30 | System RAM which is dynamically allocated during intialization. | 30 | System RAM which is dynamically allocated during initialization. |
31 | Placing the scrollback buffer in System RAM will slightly slow | 31 | Placing the scrollback buffer in System RAM will slightly slow |
32 | down the console. | 32 | down the console. |
33 | 33 | ||
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c index e8e38edb9b5b..481d58f7535d 100644 --- a/drivers/video/intelfb/intelfbdrv.c +++ b/drivers/video/intelfb/intelfbdrv.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * Linux framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G/915GM/ | 4 | * Linux framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G/915GM/ |
5 | * 945G/945GM integrated graphics chips. | 5 | * 945G/945GM integrated graphics chips. |
6 | * | 6 | * |
7 | * Copyright � 2002, 2003 David Dawes <dawes@xfree86.org> | 7 | * Copyright �� 2002, 2003 David Dawes <dawes@xfree86.org> |
8 | * 2004 Sylvain Meyer | 8 | * 2004 Sylvain Meyer |
9 | * 2006 David Airlie | 9 | * 2006 David Airlie |
10 | * | 10 | * |
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c index 2a0e32074f7d..5f6fb7d2c408 100644 --- a/drivers/video/intelfb/intelfbhw.c +++ b/drivers/video/intelfb/intelfbhw.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * Linux framebuffer driver for Intel(R) 865G integrated graphics chips. | 4 | * Linux framebuffer driver for Intel(R) 865G integrated graphics chips. |
5 | * | 5 | * |
6 | * Copyright � 2002, 2003 David Dawes <dawes@xfree86.org> | 6 | * Copyright �� 2002, 2003 David Dawes <dawes@xfree86.org> |
7 | * 2004 Sylvain Meyer | 7 | * 2004 Sylvain Meyer |
8 | * | 8 | * |
9 | * This driver consists of two parts. The first part (intelfbdrv.c) provides | 9 | * This driver consists of two parts. The first part (intelfbdrv.c) provides |
diff --git a/drivers/video/omap/Kconfig b/drivers/video/omap/Kconfig index 7f4d25b8a184..f4fcf11b290d 100644 --- a/drivers/video/omap/Kconfig +++ b/drivers/video/omap/Kconfig | |||
@@ -8,7 +8,7 @@ config FB_OMAP | |||
8 | Frame buffer driver for OMAP based boards. | 8 | Frame buffer driver for OMAP based boards. |
9 | 9 | ||
10 | config FB_OMAP_BOOTLOADER_INIT | 10 | config FB_OMAP_BOOTLOADER_INIT |
11 | bool "Check bootloader initializaion" | 11 | bool "Check bootloader initialization" |
12 | depends on FB_OMAP | 12 | depends on FB_OMAP |
13 | help | 13 | help |
14 | Say Y here if you want to enable checking if the bootloader has | 14 | Say Y here if you want to enable checking if the bootloader has |
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c index ae08d4587091..5857ccf5f6b1 100644 --- a/drivers/video/s3c2410fb.c +++ b/drivers/video/s3c2410fb.c | |||
@@ -56,7 +56,7 @@ | |||
56 | * - Add support for different devices | 56 | * - Add support for different devices |
57 | * - Backlight support | 57 | * - Backlight support |
58 | * | 58 | * |
59 | * 2004-09-05: Herbert P�tzl <herbert@13thfloor.at> | 59 | * 2004-09-05: Herbert Pötzl <herbert@13thfloor.at> |
60 | * - added clock (de-)allocation code | 60 | * - added clock (de-)allocation code |
61 | * - added fixem fbmem option | 61 | * - added fixem fbmem option |
62 | * | 62 | * |
@@ -64,7 +64,7 @@ | |||
64 | * - code cleanup | 64 | * - code cleanup |
65 | * - added a forgotten return in h1940fb_init | 65 | * - added a forgotten return in h1940fb_init |
66 | * | 66 | * |
67 | * 2004-07-19: Herbert P�tzl <herbert@13thfloor.at> | 67 | * 2004-07-19: Herbert Pötzl <herbert@13thfloor.at> |
68 | * - code cleanup and extended debugging | 68 | * - code cleanup and extended debugging |
69 | * | 69 | * |
70 | * 2004-07-15: Arnaud Patard <arnaud.patard@rtp-net.org> | 70 | * 2004-07-15: Arnaud Patard <arnaud.patard@rtp-net.org> |
diff --git a/drivers/video/vermilion/vermilion.c b/drivers/video/vermilion/vermilion.c index ff9e805c43bc..c31f549ebea0 100644 --- a/drivers/video/vermilion/vermilion.c +++ b/drivers/video/vermilion/vermilion.c | |||
@@ -23,8 +23,8 @@ | |||
23 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | 23 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
24 | * | 24 | * |
25 | * Authors: | 25 | * Authors: |
26 | * Thomas Hellstr�m <thomas-at-tungstengraphics-dot-com> | 26 | * Thomas Hellström <thomas-at-tungstengraphics-dot-com> |
27 | * Michel D�nzer <michel-at-tungstengraphics-dot-com> | 27 | * Michel Dänzer <michel-at-tungstengraphics-dot-com> |
28 | * Alan Hourihane <alanh-at-tungstengraphics-dot-com> | 28 | * Alan Hourihane <alanh-at-tungstengraphics-dot-com> |
29 | */ | 29 | */ |
30 | 30 | ||
diff --git a/drivers/video/vermilion/vermilion.h b/drivers/video/vermilion/vermilion.h index 1fc6695a49d2..c4aba59d4809 100644 --- a/drivers/video/vermilion/vermilion.h +++ b/drivers/video/vermilion/vermilion.h | |||
@@ -23,7 +23,7 @@ | |||
23 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | 23 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
24 | * | 24 | * |
25 | * Authors: | 25 | * Authors: |
26 | * Thomas Hellstr�m <thomas-at-tungstengraphics-dot-com> | 26 | * Thomas Hellström <thomas-at-tungstengraphics-dot-com> |
27 | */ | 27 | */ |
28 | 28 | ||
29 | #ifndef _VERMILION_H_ | 29 | #ifndef _VERMILION_H_ |