aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2013-07-01 17:15:04 -0400
committerTony Lindgren <tony@atomide.com>2013-07-04 08:11:16 -0400
commitea2409bab7ee7c309e558f257a3b6b7e8233f209 (patch)
tree6d5fa4ab8561deec2adadd4565bb3bc550722cd4 /sound
parent1261674a2dded2b5b055f51fb44677a8654d3f06 (diff)
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 'sound')
-rw-r--r--sound/soc/omap/rx51.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c
index 249cd230ad8f..611179c3bca4 100644
--- a/sound/soc/omap/rx51.c
+++ b/sound/soc/omap/rx51.c
@@ -396,7 +396,7 @@ static int __init rx51_soc_init(void)
396{ 396{
397 int err; 397 int err;
398 398
399 if (!machine_is_nokia_rx51()) 399 if (!machine_is_nokia_rx51() && !of_machine_is_compatible("nokia,omap3-n900"))
400 return -ENODEV; 400 return -ENODEV;
401 401
402 err = gpio_request_one(RX51_TVOUT_SEL_GPIO, 402 err = gpio_request_one(RX51_TVOUT_SEL_GPIO,