diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/video/68328fb.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/video/68328fb.c')
| -rw-r--r-- | drivers/video/68328fb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/68328fb.c b/drivers/video/68328fb.c index 0b17824b0eb5..75a39eab70c3 100644 --- a/drivers/video/68328fb.c +++ b/drivers/video/68328fb.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | #include <linux/errno.h> | 32 | #include <linux/errno.h> |
| 33 | #include <linux/string.h> | 33 | #include <linux/string.h> |
| 34 | #include <linux/mm.h> | 34 | #include <linux/mm.h> |
| 35 | #include <linux/slab.h> | ||
| 36 | #include <linux/vmalloc.h> | 35 | #include <linux/vmalloc.h> |
| 37 | #include <linux/delay.h> | 36 | #include <linux/delay.h> |
| 38 | #include <linux/interrupt.h> | 37 | #include <linux/interrupt.h> |
| @@ -308,7 +307,7 @@ static int mc68x328fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, | |||
| 308 | * Pseudocolor: | 307 | * Pseudocolor: |
| 309 | * uses offset = 0 && length = RAMDAC register width. | 308 | * uses offset = 0 && length = RAMDAC register width. |
| 310 | * var->{color}.offset is 0 | 309 | * var->{color}.offset is 0 |
| 311 | * var->{color}.length contains widht of DAC | 310 | * var->{color}.length contains width of DAC |
| 312 | * cmap is not used | 311 | * cmap is not used |
| 313 | * RAMDAC[X] is programmed to (red, green, blue) | 312 | * RAMDAC[X] is programmed to (red, green, blue) |
| 314 | * Truecolor: | 313 | * Truecolor: |