diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-26 17:00:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-26 17:00:56 -0400 |
| commit | d941cf5e373c356723fa648b9f0302a11c9b1770 (patch) | |
| tree | f79c2cab0e6223e452cbb6599859eaeec4ba8188 /drivers/mmc/card | |
| parent | 9f5577d8158d8190174d95cbf21713251cc8a044 (diff) | |
| parent | 393618510d5349e07d71dc28fb6fc49baf0d96a0 (diff) | |
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:
drivers/mmc/core/: make 3 functions static
mmc: add missing printk levels
mmc: remove redundant debug information from sdhci and wbsd
mmc: proper debugging output in core
mmc: be more verbose about card insertions/removal
mmc: Don't hold lock when releasing an added card
mmc: add a might_sleep() to mmc_claim_host()
mmc: update kerneldoc
mmc: update header file paths
sdhci: add support to ENE-CB714
mmc: check error bits before command completion
Diffstat (limited to 'drivers/mmc/card')
| -rw-r--r-- | drivers/mmc/card/queue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c index e02eac876362..c9a289c6c139 100644 --- a/drivers/mmc/card/queue.c +++ b/drivers/mmc/card/queue.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/drivers/mmc/queue.c | 2 | * linux/drivers/mmc/card/queue.c |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2003 Russell King, All Rights Reserved. | 4 | * Copyright (C) 2003 Russell King, All Rights Reserved. |
| 5 | * Copyright 2006-2007 Pierre Ossman | 5 | * Copyright 2006-2007 Pierre Ossman |