projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[linux-drm-fsl-dcu.git]
/
include
/
linux
/
mmc
/
host.h
diff --git
a/include/linux/mmc/host.h
b/include/linux/mmc/host.h
index 528e7d3fecb18123fc3f98bd022bcc5df97efc5f..c15ae1986b9833e9727a3833be875e3daac93030 100644
(file)
--- a/
include/linux/mmc/host.h
+++ b/
include/linux/mmc/host.h
@@
-110,7
+110,7
@@
struct mmc_host {
struct mmc_card *card_busy; /* the MMC card claiming host */
struct mmc_card *card_selected; /* the selected MMC card */
- struct
work_struct
detect;
+ struct
delayed_work
detect;
unsigned long private[0] ____cacheline_aligned;
};