diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-08 13:01:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-08 13:01:46 -0400 |
| commit | d71048e22f47725a5808ea2e4e1e72fa36c1a788 (patch) | |
| tree | 65debebb2964cb4cbde4d29e15730527d686a540 /drivers/video | |
| parent | 44d51a029f95d49c5c7ccd7808f81904c20c3abd (diff) | |
| parent | d21872b3683ff37f73c68993749a6e6aeeaed265 (diff) | |
Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (143 commits)
omap: mailbox: reorganize headers
omap: mailbox: standarize on 'omap-mailbox'
omap: mailbox: only compile for configured archs
omap: mailbox: simplify omap_mbox_register()
omap: mailbox: reorganize registering
omap: mailbox: add IRQ names
omap: mailbox: remove unecessary fields
omap: mailbox: don't export unecessary symbols
omap: mailbox: update omap1 probing
omap: mailbox: use correct config for omap1
omap: mailbox: 2420 should be detected at run-time
omap: mailbox: reorganize structures
omap: mailbox: trivial cleanups
omap mailbox: Set a device in logical mbox instance for traceability
omap: mailbox: convert block api to kfifo
omap: mailbox: remove (un)likely macros from cold paths
omap: mailbox cleanup: split MODULE_AUTHOR line
omap: mailbox: convert rwlocks to spinlock
Mailbox: disable mailbox interrupt when request queue
Mailbox: new mutext lock for h/w mailbox configuration
...
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/console/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/video/omap/lcd_apollon.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index 8e8f18d29d7a..5a35f22372b9 100644 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig | |||
| @@ -6,7 +6,7 @@ menu "Console display driver support" | |||
| 6 | 6 | ||
| 7 | config VGA_CONSOLE | 7 | config VGA_CONSOLE |
| 8 | bool "VGA text console" if EMBEDDED || !X86 | 8 | bool "VGA text console" if EMBEDDED || !X86 |
| 9 | depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && !ARCH_VERSATILE && !SUPERH && !BLACKFIN && !AVR32 && !MN10300 | 9 | depends on !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && !SUPERH && !BLACKFIN && !AVR32 && !MN10300 && (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) |
| 10 | default y | 10 | default y |
| 11 | help | 11 | help |
| 12 | Saying Y here will allow you to use Linux in text mode through a | 12 | Saying Y here will allow you to use Linux in text mode through a |
diff --git a/drivers/video/omap/lcd_apollon.c b/drivers/video/omap/lcd_apollon.c index 2be94eb3bbf5..10459d8bd9a0 100644 --- a/drivers/video/omap/lcd_apollon.c +++ b/drivers/video/omap/lcd_apollon.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <linux/platform_device.h> | 25 | #include <linux/platform_device.h> |
| 26 | 26 | ||
| 27 | #include <mach/gpio.h> | 27 | #include <mach/gpio.h> |
| 28 | #include <plat/mux.h> | ||
| 29 | 28 | ||
| 30 | #include "omapfb.h" | 29 | #include "omapfb.h" |
| 31 | 30 | ||
| @@ -34,8 +33,6 @@ | |||
| 34 | static int apollon_panel_init(struct lcd_panel *panel, | 33 | static int apollon_panel_init(struct lcd_panel *panel, |
| 35 | struct omapfb_device *fbdev) | 34 | struct omapfb_device *fbdev) |
| 36 | { | 35 | { |
| 37 | /* configure LCD PWR_EN */ | ||
| 38 | omap_cfg_reg(M21_242X_GPIO11); | ||
| 39 | return 0; | 36 | return 0; |
| 40 | } | 37 | } |
| 41 | 38 | ||