diff options
| author | David Howells <dhowells@redhat.com> | 2006-12-05 09:37:56 -0500 |
|---|---|---|
| committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-05 09:37:56 -0500 |
| commit | 4c1ac1b49122b805adfa4efc620592f68dccf5db (patch) | |
| tree | 87557f4bc2fd4fe65b7570489c2f610c45c0adcd /drivers/mmc/mmc_queue.h | |
| parent | c4028958b6ecad064b1a6303a6a5906d4fe48d73 (diff) | |
| parent | d916faace3efc0bf19fe9a615a1ab8fa1a24cd93 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/infiniband/core/iwcm.c
drivers/net/chelsio/cxgb2.c
drivers/net/wireless/bcm43xx/bcm43xx_main.c
drivers/net/wireless/prism54/islpci_eth.c
drivers/usb/core/hub.h
drivers/usb/input/hid-core.c
net/core/netpoll.c
Fix up merge failures with Linus's head and fix new compilation failures.
Signed-Off-By: David Howells <dhowells@redhat.com>
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; |