diff options
author | 2009-01-11 13:03:08 +0100 | |
---|---|---|
committer | 2009-01-11 13:03:08 +0100 | |
commit | df051434f1dfc93ec2e1c1d186bb87cb3db9dcdf (patch) | |
tree | 801d70ebcbabf9f4febfa0d4064227a0feb07c21 /include | |
parent | sched: partly revert "sched debug: remove NULL checking in print_cfs_rt_rq()" (diff) | |
parent | Linux 2.6.29-rc1 (diff) | |
download | wireguard-linux-df051434f1dfc93ec2e1c1d186bb87cb3db9dcdf.tar.xz wireguard-linux-df051434f1dfc93ec2e1c1d186bb87cb3db9dcdf.zip |
Merge commit 'v2.6.29-rc1' into sched/urgent
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/libata.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 4f7c8fb4d3fe..b6b8a7f3ec66 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -239,6 +239,7 @@ enum { /* host set flags */ ATA_HOST_SIMPLEX = (1 << 0), /* Host is simplex, one DMA channel per host only */ ATA_HOST_STARTED = (1 << 1), /* Host started */ + ATA_HOST_PARALLEL_SCAN = (1 << 2), /* Ports on this host can be scanned in parallel */ /* bits 24:31 of host->flags are reserved for LLD specific flags */ |