diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-16 15:34:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-16 15:34:44 -0800 |
| commit | 5b3fcfed35735af507be36a4c3f3bbeb9bc7bbf6 (patch) | |
| tree | f956ebeec64d7c4249a8886585dc8416e51d72a3 /sound | |
| parent | a12587b00388d1694933252e97abca237bc3a6b8 (diff) | |
| parent | a61c2332f8e1939cd4984b63cab641b2366eb428 (diff) | |
| download | linux-5b3fcfed35735af507be36a4c3f3bbeb9bc7bbf6.tar.gz linux-5b3fcfed35735af507be36a4c3f3bbeb9bc7bbf6.tar.bz2 linux-5b3fcfed35735af507be36a4c3f3bbeb9bc7bbf6.zip | |
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm
* 'fixes' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm:
ARM: sa11x0: assabet: fix build warning
ARM: Add arm_memblock_steal() to allocate memory away from the kernel
ARM: 7275/1: LPAE: Check the CPU support for the long descriptor format
ARM: 7274/1: NUC900: Rename nuc900-audio platform device to nuc900-ac97
ARM: 7272/1: S3C24XX: Fix build error for missing <mach/system-reset.h>
ARM: 7271/1: Fix typo in conversion of ARCH_NR_GPIOS to Kconfig
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/nuc900/nuc900-ac97.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/nuc900/nuc900-ac97.c b/sound/soc/nuc900/nuc900-ac97.c index 45d11ddaeea9..946020a647db 100644 --- a/sound/soc/nuc900/nuc900-ac97.c +++ b/sound/soc/nuc900/nuc900-ac97.c @@ -366,7 +366,7 @@ static int __devinit nuc900_ac97_drvprobe(struct platform_device *pdev) goto out3; /* enbale ac97 multifunction pin */ - mfp_set_groupg(nuc900_audio->dev, "nuc900-audio"); + mfp_set_groupg(nuc900_audio->dev, NULL); return 0; |