git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
plat-omap
/
include
/
mach
/
mmc.h
diff --git
a/arch/arm/plat-omap/include/mach/mmc.h
b/arch/arm/plat-omap/include/mach/mmc.h
index 73a9e15031b18e1c022ec372c5f04b8a97e49f69..4435bd434e179b995adfbec2944ac24436aa6119 100644
(file)
--- a/
arch/arm/plat-omap/include/mach/mmc.h
+++ b/
arch/arm/plat-omap/include/mach/mmc.h
@@
-37,6
+37,8
@@
#define OMAP_MMC_MAX_SLOTS 2
struct omap_mmc_platform_data {
+ /* back-link to device */
+ struct device *dev;
/* number of slots per controller */
unsigned nr_slots:2;