diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-15 18:47:21 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-15 18:47:21 -0700 |
commit | e089d43fb1ab8e39168c9f61d30aef5b8724d085 (patch) | |
tree | d027ec95c300076a83804b99c4014920844c34e1 /include/linux/if_bonding.h | |
parent | 0e402c6ec4f32a9192a30c4a5b5ba6867c0be7bc (diff) | |
parent | e0ff9cd12a26259f8dd676124a188037e7e90b38 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
Use menuconfig objects: IDE
sl82c105: Switch to ref counting API
ide: remove ide_use_dma()
ide: add missing validity checks for identify words 62 and 63
ide: remove ide_dma_enable()
sl82c105: add speedproc() method and MWDMA0/1 support
cs5530/sc1200: add ->speedproc support
cs5530/sc1200: DMA support cleanup
ide: use ide_tune_dma() part #2
cs5530/sc1200: add ->udma_filter methods
ide: always disable DMA before tuning it
pdc202xx_new: use ide_tune_dma()
alim15x3: use ide_tune_dma()
sis5513: PIO mode setup fixes
serverworks: PIO mode setup fixes
pdc202xx_old: rewrite mode programming code (v2)
Diffstat (limited to 'include/linux/if_bonding.h')
0 files changed, 0 insertions, 0 deletions