From 8141a0c46d95b6a1474f148d5416b956db3e569c Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Tue, 12 Apr 2011 11:29:00 -0600 Subject: [PATCH] --- yaml --- r: 248294 b: refs/heads/master c: 7b33af252fbbf3beb694448da3ba6687022fd602 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-tegra/board-harmony.c | 2 +- trunk/sound/soc/tegra/harmony.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e823ca9993e7..a253140e806c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4651d5566840e911b14a5052f18ed39558677937 +refs/heads/master: 7b33af252fbbf3beb694448da3ba6687022fd602 diff --git a/trunk/arch/arm/mach-tegra/board-harmony.c b/trunk/arch/arm/mach-tegra/board-harmony.c index 3c6bba25a1e4..987c5e46d581 100644 --- a/trunk/arch/arm/mach-tegra/board-harmony.c +++ b/trunk/arch/arm/mach-tegra/board-harmony.c @@ -75,7 +75,7 @@ static struct tegra_wm8903_platform_data harmony_audio_pdata = { }; static struct platform_device harmony_audio_device = { - .name = "tegra-snd-harmony", + .name = "tegra-snd-wm8903", .id = 0, .dev = { .platform_data = &harmony_audio_pdata, diff --git a/trunk/sound/soc/tegra/harmony.c b/trunk/sound/soc/tegra/harmony.c index c3096c3b9e2b..ae168f2446a6 100644 --- a/trunk/sound/soc/tegra/harmony.c +++ b/trunk/sound/soc/tegra/harmony.c @@ -50,7 +50,7 @@ #include "tegra_pcm.h" #include "tegra_asoc_utils.h" -#define DRV_NAME "tegra-snd-harmony" +#define DRV_NAME "tegra-snd-wm8903" #define GPIO_SPKR_EN BIT(0) #define GPIO_INT_MIC_EN BIT(1)