diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-03-19 09:38:50 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-03-19 09:38:50 +0300 |
| commit | 97eb3f24352ec6632c2127b35d8087d2a809a9b9 (patch) | |
| tree | 722948059bbd325bbca232269490124231df80d4 /arch/arm/mach-bcmring/csp/tmr/tmrHw.c | |
| parent | 439581ec07fa9cf3f519dd461a2cf41cfd3adcb4 (diff) | |
| parent | def179c271ac9b5020deca798470521f14d11edd (diff) | |
| download | linux-97eb3f24352ec6632c2127b35d8087d2a809a9b9.tar.xz | |
Merge branch 'next' into for-linus
Diffstat (limited to 'arch/arm/mach-bcmring/csp/tmr/tmrHw.c')
| -rw-r--r-- | arch/arm/mach-bcmring/csp/tmr/tmrHw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-bcmring/csp/tmr/tmrHw.c b/arch/arm/mach-bcmring/csp/tmr/tmrHw.c index 5c1c9a0e5ed2..16225e43f3c3 100644 --- a/arch/arm/mach-bcmring/csp/tmr/tmrHw.c +++ b/arch/arm/mach-bcmring/csp/tmr/tmrHw.c @@ -558,7 +558,7 @@ static int tmrHw_divide(int num, int denom) t = t << 1; } - /* Intialize the result */ + /* Initialize the result */ r = 0; do { |