diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2010-06-23 15:40:59 +0200 |
---|---|---|
committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-06-23 15:40:59 +0200 |
commit | b8fd949e585e9b991b36f9edc40ebec1a7dd885b (patch) | |
tree | 64f0f3c789309835cf4a6a8ff3b8f998037e009e /drivers/video/Kconfig | |
parent | 7d86b44375243ab26a58e598fe13bf72d9a5ab48 (diff) | |
parent | 3951d7043e3002d34780618cfa2ccf378bd14edd (diff) |
Merge branch 'glamo-2.6.34' into om-gta02-2.6.34
Conflicts:
drivers/gpio/Makefile
Diffstat (limited to 'drivers/video/Kconfig')
-rw-r--r-- | drivers/video/Kconfig | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 6e16244f3ed..421ab624a51 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -2214,6 +2214,23 @@ config FB_BROADSHEET and could also have been called by other names when coupled with a bridge adapter. +config FB_GLAMO + tristate "Smedia Glamo 336x/337x framebuffer support" + depends on FB && MFD_GLAMO + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + help + Frame buffer driver for the LCD controller in the Smedia Glamo + 336x/337x. + + This driver is also available as a module ( = code which can be + inserted and removed from the running kernel whenever you want). The + module will be called glamofb. If you want to compile it as a module, + say M here and read <file:Documentation/modules.txt>. + + If unsure, say N. + source "drivers/video/omap/Kconfig" source "drivers/video/omap2/Kconfig" |