diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-01 14:25:41 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-01 14:25:41 -0700 |
| commit | 5d3a0a95868a9669816da193bb284121df9031c8 (patch) | |
| tree | 292ce2c9135bd7b524b4710cff9a174c2967d600 /drivers/video/Kconfig | |
| parent | 7e95c548818d2b311090848083277fb907cfb56d (diff) | |
| parent | b98138e00d96abc85b100c9b6886f105d9868ab5 (diff) | |
Merge branch 'next/cleanup2' into HEAD
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-bcmring/arch.c
arch/arm/mach-tegra/devices.c
arch/arm/mach-tegra/dma.c
Diffstat (limited to 'drivers/video/Kconfig')
| -rw-r--r-- | drivers/video/Kconfig | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index b66d951b8e3..20c33c42600 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -979,18 +979,6 @@ config FB_PVR2 (<file:drivers/video/pvr2fb.c>). Please see the file <file:Documentation/fb/pvr2fb.txt>. -config FB_EPSON1355 - bool "Epson 1355 framebuffer support" - depends on (FB = y) && ARCH_CEIVA - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT - help - Build in support for the SED1355 Epson Research Embedded RAMDAC - LCD/CRT Controller (since redesignated as the S1D13505) as a - framebuffer. Product specs at - <http://vdc.epson.com/>. - config FB_S1D13XXX tristate "Epson S1D13XXX framebuffer support" depends on FB |