Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 199820
b: refs/heads/master
c: b141335
h: refs/heads/master
v: v3
  • Loading branch information
Thadeu Lima de Souza Cascardo authored and Linus Torvalds committed Jun 4, 2010
1 parent 5e8a3f3 commit e68569a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fc0ccfceb8aa6800040ba4f37a36ee306aa71c9f
refs/heads/master: b1413357d924792e2e332dcb6b712a7fb2a5fb25
6 changes: 3 additions & 3 deletions trunk/drivers/video/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ menu "Graphics support"
config HAVE_FB_ATMEL
bool

config HAVE_FB_IMX
bool

source "drivers/char/agp/Kconfig"

source "drivers/gpu/vga/Kconfig"
Expand Down Expand Up @@ -400,9 +403,6 @@ config FB_SA1100
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)
Expand Down

0 comments on commit e68569a

Please sign in to comment.