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/roland...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
plat-pxa
/
mfp.c
diff --git
a/arch/arm/plat-pxa/mfp.c
b/arch/arm/plat-pxa/mfp.c
index be58f9fe65b0db082b4b1c8af428dd6cca682a39..b77e018d36c1116cf52d1e8465319242f0dc5a47 100644
(file)
--- a/
arch/arm/plat-pxa/mfp.c
+++ b/
arch/arm/plat-pxa/mfp.c
@@
-110,6
+110,7
@@
static const unsigned long mfpr_lpm[] = {
MFPR_LPM_PULL_LOW,
MFPR_LPM_PULL_HIGH,
MFPR_LPM_FLOAT,
+ MFPR_LPM_INPUT,
};
/* mapping of MFP_PULL_* definitions to MFPR_PULL_* register bits */