summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2013-07-01 23:15:04 +0200
committerTony Lindgren <tony@atomide.com>2013-07-04 05:11:16 -0700
commitea2409bab7ee7c309e558f257a3b6b7e8233f209 (patch)
tree6d5fa4ab8561deec2adadd4565bb3bc550722cd4 /arch
parent1261674a2dded2b5b055f51fb44677a8654d3f06 (diff)
downloadlinux-0-day-ea2409bab7ee7c309e558f257a3b6b7e8233f209.tar.gz
linux-0-day-ea2409bab7ee7c309e558f257a3b6b7e8233f209.tar.xz
ARM: OMAP2+: N900: enable N900-specific drivers even if device tree is enabled
We still need video & sound drivers with device tree enabled. Signed-off-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/board-rx51-video.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-rx51-video.c b/arch/arm/mach-omap2/board-rx51-video.c
index bd74f9f6063b2..bdd1e3a179e1c 100644
--- a/arch/arm/mach-omap2/board-rx51-video.c
+++ b/arch/arm/mach-omap2/board-rx51-video.c
@@ -61,7 +61,7 @@ static struct omap_dss_board_info rx51_dss_board_info = {
static int __init rx51_video_init(void)
{
- if (!machine_is_nokia_rx51())
+ if (!machine_is_nokia_rx51() && !of_machine_is_compatible("nokia,omap3-n900"))
return 0;
if (omap_mux_init_gpio(RX51_LCD_RESET_GPIO, OMAP_PIN_OUTPUT)) {