projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
pcmcia
/
pxa2xx_palmtc.c
diff --git
a/drivers/pcmcia/pxa2xx_palmtc.c
b/drivers/pcmcia/pxa2xx_palmtc.c
index b32d05f86789202c1171981778dfca214e0e4ffa..81225a7a8cbbdb893bb2b3b163b4d5d8c90683f0 100644
(file)
--- a/
drivers/pcmcia/pxa2xx_palmtc.c
+++ b/
drivers/pcmcia/pxa2xx_palmtc.c
@@
-51,7
+51,6
@@
static void palmtc_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
struct pcmcia_state *state)
{
state->detect = 1; /* always inserted */
- state->wrprot = 0;
state->vs_3v = 1;
state->vs_Xv = 0;
}