git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
pcmcia
/
sa1100_simpad.c
diff --git
a/drivers/pcmcia/sa1100_simpad.c
b/drivers/pcmcia/sa1100_simpad.c
index
c443a1b
..
3f083e8
100644
(file)
--- a/
drivers/pcmcia/sa1100_simpad.c
+++ b/
drivers/pcmcia/sa1100_simpad.c
@@
-24,19
+24,19
@@
static struct pcmcia_irqs irqs[] = {
{ 1, IRQ_GPIO_CF_CD, "CF_CD" },
};
{ 1, IRQ_GPIO_CF_CD, "CF_CD" },
};
-static int simpad_pcmcia_hw_init(struct s
a1100
_pcmcia_socket *skt)
+static int simpad_pcmcia_hw_init(struct s
oc
_pcmcia_socket *skt)
{
clear_cs3_bit(VCC_3V_EN|VCC_5V_EN|EN0|EN1);
skt->irq = IRQ_GPIO_CF_IRQ;
{
clear_cs3_bit(VCC_3V_EN|VCC_5V_EN|EN0|EN1);
skt->irq = IRQ_GPIO_CF_IRQ;
- return s
a11xx
_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
+ return s
oc_pcmcia
_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
}
}
-static void simpad_pcmcia_hw_shutdown(struct s
a1100
_pcmcia_socket *skt)
+static void simpad_pcmcia_hw_shutdown(struct s
oc
_pcmcia_socket *skt)
{
{
- s
a11xx
_free_irqs(skt, irqs, ARRAY_SIZE(irqs));
+ s
oc_pcmcia
_free_irqs(skt, irqs, ARRAY_SIZE(irqs));
/* Disable CF bus: */
//set_cs3_bit(PCMCIA_BUFF_DIS);
/* Disable CF bus: */
//set_cs3_bit(PCMCIA_BUFF_DIS);
@@
-44,7
+44,7
@@
static void simpad_pcmcia_hw_shutdown(struct sa1100_pcmcia_socket *skt)
}
static void
}
static void
-simpad_pcmcia_socket_state(struct s
a1100
_pcmcia_socket *skt,
+simpad_pcmcia_socket_state(struct s
oc
_pcmcia_socket *skt,
struct pcmcia_state *state)
{
unsigned long levels = GPLR;
struct pcmcia_state *state)
{
unsigned long levels = GPLR;
@@
-66,7
+66,7
@@
simpad_pcmcia_socket_state(struct sa1100_pcmcia_socket *skt,
}
static int
}
static int
-simpad_pcmcia_configure_socket(struct s
a1100
_pcmcia_socket *skt,
+simpad_pcmcia_configure_socket(struct s
oc
_pcmcia_socket *skt,
const socket_state_t *state)
{
unsigned long flags;
const socket_state_t *state)
{
unsigned long flags;
@@
-103,14
+103,14
@@
simpad_pcmcia_configure_socket(struct sa1100_pcmcia_socket *skt,
return 0;
}
return 0;
}
-static void simpad_pcmcia_socket_init(struct s
a1100
_pcmcia_socket *skt)
+static void simpad_pcmcia_socket_init(struct s
oc
_pcmcia_socket *skt)
{
{
- s
a11xx
_enable_irqs(skt, irqs, ARRAY_SIZE(irqs));
+ s
oc_pcmcia
_enable_irqs(skt, irqs, ARRAY_SIZE(irqs));
}
}
-static void simpad_pcmcia_socket_suspend(struct s
a1100
_pcmcia_socket *skt)
+static void simpad_pcmcia_socket_suspend(struct s
oc
_pcmcia_socket *skt)
{
{
- s
a11xx
_disable_irqs(skt, irqs, ARRAY_SIZE(irqs));
+ s
oc_pcmcia
_disable_irqs(skt, irqs, ARRAY_SIZE(irqs));
set_cs3_bit(PCMCIA_RESET);
}
set_cs3_bit(PCMCIA_RESET);
}