diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-12-16 17:06:30 -0500 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-12-16 17:06:30 -0500 |
| commit | 5a93f42017a3d1dc7869939d46d4158732227dd7 (patch) | |
| tree | 9bdf12c1e066b472866e14bc8c70f8c8d93b8998 /arch | |
| parent | 1bda71282ded6a2e09a2db7c8884542fb46bfd4f (diff) | |
| parent | 5043e9e737c4909e7f187d479227df46f5a2dd53 (diff) | |
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.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/clock24xx.h b/arch/arm/mach-omap2/clock24xx.h index 242a19d86ccd..e5fc5bf5ceeb 100644 --- a/arch/arm/mach-omap2/clock24xx.h +++ b/arch/arm/mach-omap2/clock24xx.h | |||
| @@ -2321,7 +2321,7 @@ static struct clk i2c2_fck = { | |||
| 2321 | }; | 2321 | }; |
| 2322 | 2322 | ||
| 2323 | static struct clk i2chs2_fck = { | 2323 | static struct clk i2chs2_fck = { |
| 2324 | .name = "i2chs_fck", | 2324 | .name = "i2c_fck", |
| 2325 | .id = 2, | 2325 | .id = 2, |
| 2326 | .parent = &func_96m_ck, | 2326 | .parent = &func_96m_ck, |
| 2327 | .flags = CLOCK_IN_OMAP243X, | 2327 | .flags = CLOCK_IN_OMAP243X, |
| @@ -2354,7 +2354,7 @@ static struct clk i2c1_fck = { | |||
| 2354 | }; | 2354 | }; |
| 2355 | 2355 | ||
| 2356 | static struct clk i2chs1_fck = { | 2356 | static struct clk i2chs1_fck = { |
| 2357 | .name = "i2chs_fck", | 2357 | .name = "i2c_fck", |
| 2358 | .id = 1, | 2358 | .id = 1, |
| 2359 | .parent = &func_96m_ck, | 2359 | .parent = &func_96m_ck, |
| 2360 | .flags = CLOCK_IN_OMAP243X, | 2360 | .flags = CLOCK_IN_OMAP243X, |