diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-29 15:03:43 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-29 15:03:43 -0400 |
| commit | 949abd84cd54ff864efca9df822d1e02a56694ec (patch) | |
| tree | 0c0e7696a51e2989f11a37478ff26368cab0e227 /arch/arm/mach-omap2/clockdomains.h | |
| parent | b0958aed1ea39825439a7848544bfb2e267273b4 (diff) | |
| parent | cd07ecc828486e5887113c7dc4d9f9022145811b (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
Conflicts:
arch/arm/Makefile
Diffstat (limited to 'arch/arm/mach-omap2/clockdomains.h')
| -rw-r--r-- | arch/arm/mach-omap2/clockdomains.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/clockdomains.h b/arch/arm/mach-omap2/clockdomains.h index 281d5da19188..fe319ae4ca0a 100644 --- a/arch/arm/mach-omap2/clockdomains.h +++ b/arch/arm/mach-omap2/clockdomains.h | |||
| @@ -195,7 +195,7 @@ static struct clockdomain sgx_clkdm = { | |||
| 195 | static struct clockdomain d2d_clkdm = { | 195 | static struct clockdomain d2d_clkdm = { |
| 196 | .name = "d2d_clkdm", | 196 | .name = "d2d_clkdm", |
| 197 | .pwrdm = { .name = "core_pwrdm" }, | 197 | .pwrdm = { .name = "core_pwrdm" }, |
| 198 | .flags = CLKDM_CAN_HWSUP, | 198 | .flags = CLKDM_CAN_HWSUP_SWSUP, |
| 199 | .clktrctrl_mask = OMAP3430ES1_CLKTRCTRL_D2D_MASK, | 199 | .clktrctrl_mask = OMAP3430ES1_CLKTRCTRL_D2D_MASK, |
| 200 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430), | 200 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430), |
| 201 | }; | 201 | }; |