projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...
[linux-2.6-block.git]
/
include
/
linux
/
mmc
/
host.h
diff --git
a/include/linux/mmc/host.h
b/include/linux/mmc/host.h
index 8873e8349597aed9c76b27000c1777681eca0c5b..e326ae2882a0c5155045a594186a5ded1768444f 100644
(file)
--- a/
include/linux/mmc/host.h
+++ b/
include/linux/mmc/host.h
@@
-342,9
+342,7
@@
struct mmc_host {
mmc_pm_flag_t pm_flags; /* requested pm features */
-#ifdef CONFIG_LEDS_TRIGGERS
struct led_trigger *led; /* activity led */
-#endif
#ifdef CONFIG_REGULATOR
bool regulator_enabled; /* regulator state */