diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2012-11-07 03:11:21 +0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-11-07 03:11:21 +0400 |
commit | 55b85967f4e988d43a11bf0e432f15892e615db0 (patch) | |
tree | 101c2ddb5df41d0b813e3985a8be5c25facc45bf /arch/arm/mach-exynos/clock-exynos4.c | |
parent | 3d70f8c617a436c7146ecb81df2265b4626dfe89 (diff) | |
parent | 55b6ef7a7dad269f4438404cc63ba4718c4f8805 (diff) | |
download | linux-55b85967f4e988d43a11bf0e432f15892e615db0.tar.xz |
Merge branch 'next/cleanup-samsung' into next/cleanup-samsung-2
Diffstat (limited to 'arch/arm/mach-exynos/clock-exynos4.c')
-rw-r--r-- | arch/arm/mach-exynos/clock-exynos4.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-exynos/clock-exynos4.c b/arch/arm/mach-exynos/clock-exynos4.c index 6a45c9a9abe9..fa8a13405c94 100644 --- a/arch/arm/mach-exynos/clock-exynos4.c +++ b/arch/arm/mach-exynos/clock-exynos4.c @@ -613,11 +613,6 @@ static struct clk exynos4_init_clocks_off[] = { .ctrlbit = (1 << 18), }, { .name = "iis", - .devname = "samsung-i2s.0", - .enable = exynos4_clk_ip_peril_ctrl, - .ctrlbit = (1 << 19), - }, { - .name = "iis", .devname = "samsung-i2s.1", .enable = exynos4_clk_ip_peril_ctrl, .ctrlbit = (1 << 20), |