diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /arch/arm/mach-omap2/omap_hwmod_2430_data.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod_2430_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_2430_data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c index a860fb5024c..e6e3810db77 100644 --- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c | |||
| @@ -1559,7 +1559,7 @@ static struct omap_hwmod omap2430_i2c1_hwmod = { | |||
| 1559 | * I2CHS IP's do not follow the usual pattern. | 1559 | * I2CHS IP's do not follow the usual pattern. |
| 1560 | * prcm_reg_id alone cannot be used to program | 1560 | * prcm_reg_id alone cannot be used to program |
| 1561 | * the iclk and fclk. Needs to be handled using | 1561 | * the iclk and fclk. Needs to be handled using |
| 1562 | * additonal flags when clk handling is moved | 1562 | * additional flags when clk handling is moved |
| 1563 | * to hwmod framework. | 1563 | * to hwmod framework. |
| 1564 | */ | 1564 | */ |
| 1565 | .module_offs = CORE_MOD, | 1565 | .module_offs = CORE_MOD, |