diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 12:17:26 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 12:17:26 +0100 |
commit | f9b44121b34174ae4f243a568393fc3225842e75 (patch) | |
tree | 943f68cd7458d08a9e8809ed0a10b71b23911f3e /drivers/video/omap/lcdc.c | |
parent | ASoC: pxa-pcm-lib: initialize DMA channel to -1 (diff) | |
parent | Linux 2.6.34-rc2 (diff) | |
download | linux-f9b44121b34174ae4f243a568393fc3225842e75.tar.xz linux-f9b44121b34174ae4f243a568393fc3225842e75.zip |
Merge commit 'v2.6.34-rc2' into for-2.6.34
Diffstat (limited to 'drivers/video/omap/lcdc.c')
-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 a33483910dc8..9557f963662e 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) /* * Configure the LCD DMA for a palette load operation and do the palette * downloading synchronously. We don't use the frame+palette load mode of - * the controller, since the palette can always be downloaded seperately. + * the controller, since the palette can always be downloaded separately. */ static void load_palette(void) { |