diff options
author | Felix Blyakher <felixb@sgi.com> | 2009-02-03 10:38:41 -0600 |
---|---|---|
committer | Felix Blyakher <felixb@sgi.com> | 2009-02-03 10:38:41 -0600 |
commit | 6d2160bfe7826aca1c94b4bca77093908a452ae7 (patch) | |
tree | 8153fcd8a7c467e5de136f312e8ef5b27bea9d6b /drivers/ide/falconide.c | |
parent | f0e0059b9c18426cffdcc04161062251a8f9741e (diff) | |
parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) | |
download | kernel-crypto-6d2160bfe7826aca1c94b4bca77093908a452ae7.tar.gz kernel-crypto-6d2160bfe7826aca1c94b4bca77093908a452ae7.tar.xz kernel-crypto-6d2160bfe7826aca1c94b4bca77093908a452ae7.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/ide/falconide.c')
-rw-r--r-- | drivers/ide/falconide.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/falconide.c b/drivers/ide/falconide.c index a5ba820d69b..a638e952d67 100644 --- a/drivers/ide/falconide.c +++ b/drivers/ide/falconide.c @@ -82,7 +82,7 @@ static const struct ide_tp_ops falconide_tp_ops = { static const struct ide_port_info falconide_port_info = { .tp_ops = &falconide_tp_ops, - .host_flags = IDE_HFLAG_NO_DMA, + .host_flags = IDE_HFLAG_NO_DMA | IDE_HFLAG_SERIALIZE, }; static void __init falconide_setup_ports(hw_regs_t *hw) |