diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
| commit | 42933bac11e811f02200c944d8562a15f8ec4ff0 (patch) | |
| tree | fcdd9afe56eb0e746565ddd1f92f22d36678b843 /drivers/video/kyro/STG4000OverlayDevice.c | |
| parent | 2b9accbee563f535046ff2cd382d0acaa92e130c (diff) | |
| parent | 25985edcedea6396277003854657b5f3cb31a628 (diff) | |
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
Fix common misspellings
Diffstat (limited to 'drivers/video/kyro/STG4000OverlayDevice.c')
| -rw-r--r-- | drivers/video/kyro/STG4000OverlayDevice.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/kyro/STG4000OverlayDevice.c b/drivers/video/kyro/STG4000OverlayDevice.c index a8c9713413e6..0aeeaa10708b 100644 --- a/drivers/video/kyro/STG4000OverlayDevice.c +++ b/drivers/video/kyro/STG4000OverlayDevice.c | |||
| @@ -417,7 +417,7 @@ int SetOverlayViewPort(volatile STG4000REG __iomem *pSTGReg, | |||
| 417 | /***************** Horizontal decimation/scaling ***************************/ | 417 | /***************** Horizontal decimation/scaling ***************************/ |
| 418 | 418 | ||
| 419 | /* | 419 | /* |
| 420 | * Now we handle the horizontal case, this is a simplified verison of | 420 | * Now we handle the horizontal case, this is a simplified version of |
| 421 | * the vertical case in that we decimate by factors of 2. as we are | 421 | * the vertical case in that we decimate by factors of 2. as we are |
| 422 | * working in words we should always be able to decimate by these | 422 | * working in words we should always be able to decimate by these |
| 423 | * factors. as we always have to have a buffer which is aligned to a | 423 | * factors. as we always have to have a buffer which is aligned to a |