diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-12 03:05:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-12 03:05:35 -0400 |
| commit | 278554bd6579206921f5d8a523649a7a57f8850d (patch) | |
| tree | 4e6c527daf0910e455b3aa72e2c96b0479e430be /arch/arm/mach-omap2/clock3xxx_data.c | |
| parent | 5a147e8bf982f9dd414c1dd751fe02c1942506b2 (diff) | |
| parent | cea0d767c29669bf89f86e4aee46ef462d2ebae8 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ar9170/usb.c
drivers/scsi/iscsi_tcp.c
net/ipv4/ipmr.c
Diffstat (limited to 'arch/arm/mach-omap2/clock3xxx_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/clock3xxx_data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c index d5153b6bd6cb..9cba5560519b 100644 --- a/arch/arm/mach-omap2/clock3xxx_data.c +++ b/arch/arm/mach-omap2/clock3xxx_data.c | |||
| @@ -895,7 +895,7 @@ static struct clk dpll4_m4x2_ck = { | |||
| 895 | .ops = &clkops_omap2_dflt_wait, | 895 | .ops = &clkops_omap2_dflt_wait, |
| 896 | .parent = &dpll4_m4_ck, | 896 | .parent = &dpll4_m4_ck, |
| 897 | .enable_reg = OMAP_CM_REGADDR(PLL_MOD, CM_CLKEN), | 897 | .enable_reg = OMAP_CM_REGADDR(PLL_MOD, CM_CLKEN), |
| 898 | .enable_bit = OMAP3430_PWRDN_CAM_SHIFT, | 898 | .enable_bit = OMAP3430_PWRDN_DSS1_SHIFT, |
| 899 | .flags = INVERT_ENABLE, | 899 | .flags = INVERT_ENABLE, |
| 900 | .clkdm_name = "dpll4_clkdm", | 900 | .clkdm_name = "dpll4_clkdm", |
| 901 | .recalc = &omap3_clkoutx2_recalc, | 901 | .recalc = &omap3_clkoutx2_recalc, |