diff options
author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-02 11:29:04 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-02 11:29:04 -0500 |
commit | cdb54fac35812a21943f0e506e8e3b94b469a77c (patch) | |
tree | 52b076a044b7fcfa9c14df4b4cac1ceff51ce689 /drivers/mmc/mmc_queue.h | |
parent | 37043318b12ea351c357d7bd8a184b63940f38d7 (diff) | |
parent | 8b7feff881b7e9f065ddd718a6841121207c3c19 (diff) |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/drzeus/mmc:
mmc: correct request error handling
mmc: Flush block queue when removing card
mmc: sdhci high speed support
mmc: Support for high speed SD cards
mmc: Fix mmc_delay() function
mmc: Add support for mmc v4 wide-bus modes
[PATCH] mmc: Add support for mmc v4 high speed mode
trivial change for mmc/Kconfig: MMC_PXA does not mean only PXA255
Make general code cleanups
Add MMC_CAP_{MULTIWRITE,BYTEBLOCK} flags
Platform device error handling cleanup
Move register definitions away from the header file
Change OMAP_MMC_{READ,WRITE} macros to use the host pointer
Replace base with virt_base and phys_base
mmc: constify mmc_host_ops vectors
mmc: remove kernel_thread()
Diffstat (limited to 'drivers/mmc/mmc_queue.h')
-rw-r--r-- | drivers/mmc/mmc_queue.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mmc/mmc_queue.h b/drivers/mmc/mmc_queue.h index 7182d2f69b4e..c9f139e764f6 100644 --- a/drivers/mmc/mmc_queue.h +++ b/drivers/mmc/mmc_queue.h | |||
@@ -6,8 +6,7 @@ struct task_struct; | |||
6 | 6 | ||
7 | struct mmc_queue { | 7 | struct mmc_queue { |
8 | struct mmc_card *card; | 8 | struct mmc_card *card; |
9 | struct completion thread_complete; | 9 | struct task_struct *thread; |
10 | wait_queue_head_t thread_wq; | ||
11 | struct semaphore thread_sem; | 10 | struct semaphore thread_sem; |
12 | unsigned int flags; | 11 | unsigned int flags; |
13 | struct request *req; | 12 | struct request *req; |