From 18dbe6c5dd3de93e99afdaf1f0fa663b57314c63 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Mon, 5 Jul 2010 16:31:39 +0300 Subject: omap: mux: Mux Apollon LCD power in board-apollon.c Use the new mux function for that. Cc: Kyungmin Park Cc: Tomi Valkeinen Signed-off-by: Tony Lindgren --- drivers/video/omap/lcd_apollon.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'drivers/video') diff --git a/drivers/video/omap/lcd_apollon.c b/drivers/video/omap/lcd_apollon.c index 2be94eb3bbf..10459d8bd9a 100644 --- a/drivers/video/omap/lcd_apollon.c +++ b/drivers/video/omap/lcd_apollon.c @@ -25,7 +25,6 @@ #include #include -#include #include "omapfb.h" @@ -34,8 +33,6 @@ static int apollon_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev) { - /* configure LCD PWR_EN */ - omap_cfg_reg(M21_242X_GPIO11); return 0; } -- cgit v1.2.3 From fb78b51cb11ecaa4eddc0de182eee3b84fcd3ef8 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Mon, 5 Jul 2010 16:31:46 +0300 Subject: ARM: Disable VGA console for ARM in most cases Otherwise we have to disable it manually to avoid compile errors. Now it's only enabled only for the selected machines as suggested by Anton Vorontsov : $ git grep VGA_CONSOLE= arch/arm/configs/ arch/arm/configs/footbridge_defconfig:CONFIG_VGA_CONSOLE=y arch/arm/configs/integrator_defconfig:CONFIG_VGA_CONSOLE=y arch/arm/configs/netwinder_defconfig:CONFIG_VGA_CONSOLE=y Note that the Kconfig entry no longer needs separate entries for ARCH_ACORN, ARCH_EBSA110 ARCH_VERSATILE. Cc: linux-fbdev@vger.kernel.org Signed-off-by: Tony Lindgren --- drivers/video/console/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/video') diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index 8e8f18d29d7..5a35f22372b 100644 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig @@ -6,7 +6,7 @@ menu "Console display driver support" config VGA_CONSOLE bool "VGA text console" if EMBEDDED || !X86 - depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && !ARCH_VERSATILE && !SUPERH && !BLACKFIN && !AVR32 && !MN10300 + depends on !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && !SUPERH && !BLACKFIN && !AVR32 && !MN10300 && (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) default y help Saying Y here will allow you to use Linux in text mode through a -- cgit v1.2.3