diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/ide/cy82c693.c | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'drivers/ide/cy82c693.c')
| -rw-r--r-- | drivers/ide/cy82c693.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/cy82c693.c b/drivers/ide/cy82c693.c index 9383f67deae1..3be60da52123 100644 --- a/drivers/ide/cy82c693.c +++ b/drivers/ide/cy82c693.c | |||
| @@ -67,7 +67,7 @@ static void cy82c693_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive) | |||
| 67 | 67 | ||
| 68 | /* | 68 | /* |
| 69 | * note: below we set the value for Bus Master IDE TimeOut Register | 69 | * note: below we set the value for Bus Master IDE TimeOut Register |
| 70 | * I'm not absolutly sure what this does, but it solved my problem | 70 | * I'm not absolutely sure what this does, but it solved my problem |
| 71 | * with IDE DMA and sound, so I now can play sound and work with | 71 | * with IDE DMA and sound, so I now can play sound and work with |
| 72 | * my IDE driver at the same time :-) | 72 | * my IDE driver at the same time :-) |
| 73 | * | 73 | * |