diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-07-21 16:32:06 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-21 16:32:06 +0200 |
commit | 5ddac6bc1c4bfcbf645d18668a5033ca257a8ea7 (patch) | |
tree | a8a74ef15a3622ecc3ab94a424321de8b111648b /arch/arm/mach-exynos4/dev-audio.c | |
parent | c33d4326b60a3aea5cd070a365043f488f81a3b0 (diff) | |
parent | 89e1c3d0fffa0d610fa7292bbfafb5e87dc6be34 (diff) | |
download | talos-op-linux-5ddac6bc1c4bfcbf645d18668a5033ca257a8ea7.tar.gz talos-op-linux-5ddac6bc1c4bfcbf645d18668a5033ca257a8ea7.zip |
Merge branch 'next-samsung-board' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/board
Diffstat (limited to 'arch/arm/mach-exynos4/dev-audio.c')
-rw-r--r-- | arch/arm/mach-exynos4/dev-audio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos4/dev-audio.c b/arch/arm/mach-exynos4/dev-audio.c index 1eed5f9f7bd3..983069a53239 100644 --- a/arch/arm/mach-exynos4/dev-audio.c +++ b/arch/arm/mach-exynos4/dev-audio.c @@ -330,7 +330,7 @@ struct platform_device exynos4_device_ac97 = { static int exynos4_spdif_cfg_gpio(struct platform_device *pdev) { - s3c_gpio_cfgpin_range(EXYNOS4_GPC1(0), 2, S3C_GPIO_SFN(3)); + s3c_gpio_cfgpin_range(EXYNOS4_GPC1(0), 2, S3C_GPIO_SFN(4)); return 0; } |