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/omap | |
| 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/omap')
| -rw-r--r-- | drivers/video/omap/lcdc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap/lcdc.c b/drivers/video/omap/lcdc.c index a33483910dc..9557f963662 100644 --- a/drivers/video/omap/lcdc.c +++ b/drivers/video/omap/lcdc.c | |||
| @@ -389,7 +389,7 @@ static int omap_lcdc_enable_plane(int plane, int enable) | |||
| 389 | /* | 389 | /* |
| 390 | * Configure the LCD DMA for a palette load operation and do the palette | 390 | * Configure the LCD DMA for a palette load operation and do the palette |
| 391 | * downloading synchronously. We don't use the frame+palette load mode of | 391 | * downloading synchronously. We don't use the frame+palette load mode of |
| 392 | * the controller, since the palette can always be downloaded seperately. | 392 | * the controller, since the palette can always be downloaded separately. |
| 393 | */ | 393 | */ |
| 394 | static void load_palette(void) | 394 | static void load_palette(void) |
| 395 | { | 395 | { |