git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
drivers
/
video
/
Kconfig
diff --git
a/drivers/video/Kconfig
b/drivers/video/Kconfig
index
1e6fec4
..
3d94a14
100644
(file)
--- a/
drivers/video/Kconfig
+++ b/
drivers/video/Kconfig
@@
-8,6
+8,9
@@
menu "Graphics support"
config HAVE_FB_ATMEL
bool
config HAVE_FB_ATMEL
bool
+config HAVE_FB_IMX
+ bool
+
source "drivers/char/agp/Kconfig"
source "drivers/gpu/vga/Kconfig"
source "drivers/char/agp/Kconfig"
source "drivers/gpu/vga/Kconfig"
@@
-400,9
+403,6
@@
config FB_SA1100
If you plan to use the LCD display with your SA-1100 system, say
Y here.
If you plan to use the LCD display with your SA-1100 system, say
Y here.
-config HAVE_FB_IMX
- bool
-
config FB_IMX
tristate "Motorola i.MX LCD support"
depends on FB && (HAVE_FB_IMX || ARCH_MX1 || ARCH_MX2)
config FB_IMX
tristate "Motorola i.MX LCD support"
depends on FB && (HAVE_FB_IMX || ARCH_MX1 || ARCH_MX2)