summaryrefslogtreecommitdiffstats
path: root/sound/soc/omap/omap2evm.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-10-23 17:01:17 +0200
committerTakashi Iwai <tiwai@suse.de>2010-10-23 17:01:17 +0200
commitb11bdb5254ff17cb63e4ae5088b73fdcd2cc2602 (patch)
treeb5d57f358bf83d31ccdad3604b4a6e82a47ff612 /sound/soc/omap/omap2evm.c
parent4428bc0990ba545e2ef0dea8ec1b90c256b22958 (diff)
parent84eae18c867fcb7ce43d5830e23377ed33e45df9 (diff)
downloadop-kernel-dev-b11bdb5254ff17cb63e4ae5088b73fdcd2cc2602.zip
op-kernel-dev-b11bdb5254ff17cb63e4ae5088b73fdcd2cc2602.tar.gz
Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into topic/asoc
Diffstat (limited to 'sound/soc/omap/omap2evm.c')
-rw-r--r--sound/soc/omap/omap2evm.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/omap/omap2evm.c b/sound/soc/omap/omap2evm.c
index 38cd189..cf3fc8a 100644
--- a/sound/soc/omap/omap2evm.c
+++ b/sound/soc/omap/omap2evm.c
@@ -103,10 +103,8 @@ static int __init omap2evm_soc_init(void)
{
int ret;
- if (!machine_is_omap2evm()) {
- pr_debug("Not omap2evm!\n");
+ if (!machine_is_omap2evm())
return -ENODEV;
- }
printk(KERN_INFO "omap2evm SoC init\n");
omap2evm_snd_device = platform_device_alloc("soc-audio", -1);
OpenPOWER on IntegriCloud