diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
| commit | 318ae2edc3b29216abd8a2510f3f80b764f06858 (patch) | |
| tree | ce595adde342f57f379d277b25e4dd206988a052 /drivers/video/pm2fb.c | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
| parent | 3e58974027b04e84f68b964ef368a6cd758e2f84 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c
Diffstat (limited to 'drivers/video/pm2fb.c')
| -rw-r--r-- | drivers/video/pm2fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c index 36436ee6c1a4..27f93aab6ddc 100644 --- a/drivers/video/pm2fb.c +++ b/drivers/video/pm2fb.c | |||
| @@ -896,7 +896,7 @@ static int pm2fb_setcolreg(unsigned regno, unsigned red, unsigned green, | |||
| 896 | * Pseudocolor: | 896 | * Pseudocolor: |
| 897 | * uses offset = 0 && length = DAC register width. | 897 | * uses offset = 0 && length = DAC register width. |
| 898 | * var->{color}.offset is 0 | 898 | * var->{color}.offset is 0 |
| 899 | * var->{color}.length contains widht of DAC | 899 | * var->{color}.length contains width of DAC |
| 900 | * cmap is not used | 900 | * cmap is not used |
| 901 | * DAC[X] is programmed to (red, green, blue) | 901 | * DAC[X] is programmed to (red, green, blue) |
| 902 | * Truecolor: | 902 | * Truecolor: |