summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2008-12-16 22:06:30 +0000
committerBen Dooks <ben-linux@fluff.org>2008-12-16 22:06:30 +0000
commit5a93f42017a3d1dc7869939d46d4158732227dd7 (patch)
tree9bdf12c1e066b472866e14bc8c70f8c8d93b8998 /arch
parent1bda71282ded6a2e09a2db7c8884542fb46bfd4f (diff)
parent5043e9e737c4909e7f187d479227df46f5a2dd53 (diff)
downloadop-kernel-dev-5a93f42017a3d1dc7869939d46d4158732227dd7.zip
op-kernel-dev-5a93f42017a3d1dc7869939d46d4158732227dd7.tar.gz
Merge branch 'i2c-for-ben' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into i2c-next
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/clock24xx.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/clock24xx.h b/arch/arm/mach-omap2/clock24xx.h
index 242a19d..e5fc5bf 100644
--- a/arch/arm/mach-omap2/clock24xx.h
+++ b/arch/arm/mach-omap2/clock24xx.h
@@ -2321,7 +2321,7 @@ static struct clk i2c2_fck = {
};
static struct clk i2chs2_fck = {
- .name = "i2chs_fck",
+ .name = "i2c_fck",
.id = 2,
.parent = &func_96m_ck,
.flags = CLOCK_IN_OMAP243X,
@@ -2354,7 +2354,7 @@ static struct clk i2c1_fck = {
};
static struct clk i2chs1_fck = {
- .name = "i2chs_fck",
+ .name = "i2c_fck",
.id = 1,
.parent = &func_96m_ck,
.flags = CLOCK_IN_OMAP243X,
OpenPOWER on IntegriCloud