summaryrefslogtreecommitdiffstats
path: root/drivers/video/omap/Kconfig
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-05-20 00:43:00 -0600
committerGrant Likely <grant.likely@secretlab.ca>2011-05-20 00:43:00 -0600
commit78fab4c04c76b8c9327541bd270f82b85b42bbf7 (patch)
treeb43006348a1ac15c28e6791d08646809761a2a4a /drivers/video/omap/Kconfig
parent3b8a4dd3ebfcc647260ad5c39ef4f73eb3a6b155 (diff)
parent61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf (diff)
downloadtalos-op-linux-78fab4c04c76b8c9327541bd270f82b85b42bbf7.tar.gz
talos-op-linux-78fab4c04c76b8c9327541bd270f82b85b42bbf7.zip
Merge commit 'v2.6.39' into spi/next
Diffstat (limited to 'drivers/video/omap/Kconfig')
-rw-r--r--drivers/video/omap/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap/Kconfig b/drivers/video/omap/Kconfig
index 15e7f1912af9..196fa2e7f438 100644
--- a/drivers/video/omap/Kconfig
+++ b/drivers/video/omap/Kconfig
@@ -64,7 +64,7 @@ config FB_OMAP_MANUAL_UPDATE
depends on FB_OMAP && FB_OMAP_LCDC_EXTERNAL
help
Say Y here, if your user-space applications are capable of
- notifying the frame buffer driver when a change has occured in
+ notifying the frame buffer driver when a change has occurred in
the frame buffer content and thus a reload of the image data to
the external frame buffer is required. If unsure, say N.
OpenPOWER on IntegriCloud