diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-07-15 20:11:34 -0600 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-07-15 20:11:34 -0600 |
commit | 8c11642a50555e584774737f7c296f9aece310cf (patch) | |
tree | 1ff8dfaf05479593ef2c50378a68dfc6aec495a5 /arch/arm/mach-exynos4/dev-audio.c | |
parent | 5d10302f46df1d9a85c34ea97f9b6c29e414482e (diff) | |
parent | 620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc (diff) |
Merge commit 'v3.0-rc7' into devicetree/next
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 1eed5f9f7bd..983069a5323 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; } |