git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'docs-next' of git://git.lwn.net/linux-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
pcm990-baseboard.c
diff --git
a/arch/arm/mach-pxa/pcm990-baseboard.c
b/arch/arm/mach-pxa/pcm990-baseboard.c
index
9d0ecea
..
f56ae10
100644
(file)
--- a/
arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/
arch/arm/mach-pxa/pcm990-baseboard.c
@@
-326,7
+326,7
@@
static void pcm990_mci_exit(struct device *dev, void *data)
#define MSECS_PER_JIFFY (1000/HZ)
static struct pxamci_platform_data pcm990_mci_platform_data = {
#define MSECS_PER_JIFFY (1000/HZ)
static struct pxamci_platform_data pcm990_mci_platform_data = {
- .detect_delay
= 250 / MSECS_PER_JIFFY
,
+ .detect_delay
_ms = 250
,
.ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
.init = pcm990_mci_init,
.setpower = pcm990_mci_setpower,
.ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
.init = pcm990_mci_init,
.setpower = pcm990_mci_setpower,