diff options
| author | Tony Lindgren <tony@atomide.com> | 2006-12-07 13:58:10 -0800 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-05-08 20:36:31 +0100 |
| commit | c40fae9525e6c29c87a4f4361ff0a8d67a36e448 (patch) | |
| tree | 00c3e0008b3e963c5a622245b951f1135e456c24 /arch/arm/plat-omap/dmtimer.c | |
| parent | f4e4c324a5f81f18156499d1ade3732ba1f5b523 (diff) | |
| download | linux-c40fae9525e6c29c87a4f4361ff0a8d67a36e448.tar.bz2 | |
ARM: OMAP: Sync core code with linux-omap
This patch syncs omap specific core code with linux-omap.
Most of the changes are needed to fix bitrot caused by
driver updates in linux-omap tree.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/plat-omap/dmtimer.c')
| -rw-r--r-- | arch/arm/plat-omap/dmtimer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index 659619f235ca..36073dfaa4db 100644 --- a/arch/arm/plat-omap/dmtimer.c +++ b/arch/arm/plat-omap/dmtimer.c @@ -372,7 +372,7 @@ void omap_dm_timer_set_source(struct omap_dm_timer *timer, int source) /* When the functional clock disappears, too quick writes seem to * cause an abort. */ - __delay(15000); + __delay(150000); } #endif |