diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-17 23:03:39 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-17 23:03:39 +0300 |
| commit | cd4348339c21f4a15c01f3f120e92b3224a0a7da (patch) | |
| tree | d45fe54ca6d9bc2182943633d6649a417c5de675 /arch/arm/mach-omap1/clock.h | |
| parent | 7e1548a597ef7e26d5d62f8be3be6da9e101b26c (diff) | |
| parent | 917fa280e5e99edcae44a34feab295a59922d16c (diff) | |
| download | linux-cd4348339c21f4a15c01f3f120e92b3224a0a7da.tar.xz | |
Merge branch 'hsmmc-init' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
Diffstat (limited to 'arch/arm/mach-omap1/clock.h')
| -rw-r--r-- | arch/arm/mach-omap1/clock.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/clock.h b/arch/arm/mach-omap1/clock.h index 5635b511ab6f..c1dcdf18d8dd 100644 --- a/arch/arm/mach-omap1/clock.h +++ b/arch/arm/mach-omap1/clock.h @@ -705,7 +705,6 @@ static struct clk bclk_16xx = { static struct clk mmc1_ck = { .name = "mmc_ck", - .id = 1, /* Functional clock is direct from ULPD, interface clock is ARMPER */ .parent = &armper_ck.clk, .rate = 48000000, @@ -720,7 +719,7 @@ static struct clk mmc1_ck = { static struct clk mmc2_ck = { .name = "mmc_ck", - .id = 2, + .id = 1, /* Functional clock is direct from ULPD, interface clock is ARMPER */ .parent = &armper_ck.clk, .rate = 48000000, |