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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
[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 4435bd434e179b995adfbec2944ac24436aa6119..81d5b36534b340680ffc36fde156e9cafbb70e2d 100644
(file)
--- a/
arch/arm/plat-omap/include/mach/mmc.h
+++ b/
arch/arm/plat-omap/include/mach/mmc.h
@@
-79,7
+79,6
@@
struct omap_mmc_platform_data {
/* use the internal clock */
unsigned internal_clock:1;
- s16 power_pin;
int switch_pin; /* gpio (card detect) */
int gpio_wp; /* gpio (write protect) */