summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-23 15:27:39 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-23 15:27:39 -0700
commit59d0952b43552570e0f1c3ff91ebb16d4caec171 (patch)
tree0f953329b6667b64c7758e694fe50b212806cc59 /include/linux
parent1259f6ee15c1603dcae41eb6af5a5f9cf932d4d6 (diff)
parent2fff27512600f9ad91335577e485a8552edb0abf (diff)
Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
Pull libata update from Jeff Garzik: "Changes, all of them boring and minor: 1) Ugly MSFT Hyper-V workaround in ata_piix 2) Fix a longstanding error recovery delay caused by excessive re-re-retries, when media errors occur. 3) Minor hw-specific workarounds and quirks 4) New PATA driver for ep93xx" * tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: PATA host controller driver for ep93xx [libata] Add " 2GB ATA Flash Disk"/"ADMA428M" to DMA blacklist ata_generic: Skip is_intel_ider() check when ata_generic=1 is set libata-eh don't waste time retrying media errors (v3) ata_piix: defer disks to the Hyper-V drivers by default libata: add a host flag to ignore detected ATA devices
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/libata.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h
index e926df7b54c9..6e887c742a27 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -247,6 +247,7 @@ enum {
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 */
+ ATA_HOST_IGNORE_ATA = (1 << 3), /* Ignore ATA devices on this host. */
/* bits 24:31 of host->flags are reserved for LLD specific flags */