diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-18 08:03:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-18 08:03:01 -0800 |
| commit | d55653377df36f8c04a966f3420335f1a0eb4d83 (patch) | |
| tree | a986fbd0e8310b1fec44886001f8aeecce32f42a /drivers/mmc/host/sdhci.h | |
| parent | c63a1190368771b8207d86c4217ae4afdf1cbd5e (diff) | |
| parent | cc3000e4ef13fa9f388f5a37f11c0fa3cc68112b (diff) | |
| download | blackbird-op-linux-d55653377df36f8c04a966f3420335f1a0eb4d83.tar.gz blackbird-op-linux-d55653377df36f8c04a966f3420335f1a0eb4d83.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
mmc: remove unused 'mode' from the mmc_host structure
sdhci: support JMicron JMB38x chips
sdhci: use PIO when DMA can't satisfy the request
sdhci: don't warn about sdhci 2.0 controllers
sdhci: describe quirks
Diffstat (limited to 'drivers/mmc/host/sdhci.h')
| -rw-r--r-- | drivers/mmc/host/sdhci.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 05195ea900f4..e4d77b038bfa 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -171,7 +171,8 @@ struct sdhci_host { spinlock_t lock; /* Mutex */ int flags; /* Host attributes */ -#define SDHCI_USE_DMA (1<<0) +#define SDHCI_USE_DMA (1<<0) /* Host is DMA capable */ +#define SDHCI_REQ_USE_DMA (1<<1) /* Use DMA for this req. */ unsigned int max_clk; /* Max possible freq (MHz) */ unsigned int timeout_clk; /* Timeout freq (KHz) */ |
