From efc5c92bbb7051eab7682631fdfee6731c47bb3a Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Sun, 3 Feb 2008 17:26:02 +0200 Subject: [PATCH] --- yaml --- r: 82789 b: refs/heads/master c: f26fc4e08a0d045b108ab279cb8c8bd676f83c02 h: refs/heads/master i: 82787: e9cd553ec0da03c45bf8832fdcbb572254334ba4 v: v3 --- [refs] | 2 +- trunk/drivers/pcmcia/m32r_pcc.c | 2 +- trunk/drivers/pcmcia/m8xx_pcmcia.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 73aafd1c61aa..b5f16d82231b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4f63ba170866731fd388ce5eff05d5705b193b0c +refs/heads/master: f26fc4e08a0d045b108ab279cb8c8bd676f83c02 diff --git a/trunk/drivers/pcmcia/m32r_pcc.c b/trunk/drivers/pcmcia/m32r_pcc.c index c5e0d89c3ece..ec4c1253ebbb 100644 --- a/trunk/drivers/pcmcia/m32r_pcc.c +++ b/trunk/drivers/pcmcia/m32r_pcc.c @@ -368,7 +368,7 @@ static irqreturn_t pcc_interrupt(int irq, void *dev) handled = 1; irc = pcc_get(i, PCIRC); irc >>=16; - debug(2, "m32r-pcc:interrput: socket %d pcirc 0x%02x ", i, irc); + debug(2, "m32r-pcc:interrupt: socket %d pcirc 0x%02x ", i, irc); if (!irc) continue; diff --git a/trunk/drivers/pcmcia/m8xx_pcmcia.c b/trunk/drivers/pcmcia/m8xx_pcmcia.c index d182760f035b..4ea426a25909 100644 --- a/trunk/drivers/pcmcia/m8xx_pcmcia.c +++ b/trunk/drivers/pcmcia/m8xx_pcmcia.c @@ -851,7 +851,7 @@ static int m8xx_set_socket(struct pcmcia_socket *sock, socket_state_t * state) I tried to control the CxOE signal with SS_OUTPUT_ENA, but the reset signal seems connected via the 541. If the CxOE is left high are some signals tristated and - no pullups are present -> the cards act wierd. + no pullups are present -> the cards act weird. So right now the buffers are enabled if the power is on. */ if (state->Vcc || state->Vpp)