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_cerf.c
diff --git
a/drivers/pcmcia/sa1100_cerf.c
b/drivers/pcmcia/sa1100_cerf.c
index
cd671b6
..
2b3c289
100644
(file)
--- a/
drivers/pcmcia/sa1100_cerf.c
+++ b/
drivers/pcmcia/sa1100_cerf.c
@@
-27,20
+27,20
@@
static struct pcmcia_irqs irqs[] = {
{ CERF_SOCKET, CERF_IRQ_GPIO_CF_BVD1, "CF_BVD1" }
};
{ CERF_SOCKET, CERF_IRQ_GPIO_CF_BVD1, "CF_BVD1" }
};
-static int cerf_pcmcia_hw_init(struct s
a1100
_pcmcia_socket *skt)
+static int cerf_pcmcia_hw_init(struct s
oc
_pcmcia_socket *skt)
{
skt->irq = CERF_IRQ_GPIO_CF_IRQ;
{
skt->irq = CERF_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 cerf_pcmcia_hw_shutdown(struct s
a1100
_pcmcia_socket *skt)
+static void cerf_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));
}
static void
}
static void
-cerf_pcmcia_socket_state(struct s
a1100
_pcmcia_socket *skt, struct pcmcia_state *state)
+cerf_pcmcia_socket_state(struct s
oc
_pcmcia_socket *skt, struct pcmcia_state *state)
{
unsigned long levels = GPLR;
{
unsigned long levels = GPLR;
@@
-54,7
+54,7
@@
cerf_pcmcia_socket_state(struct sa1100_pcmcia_socket *skt, struct pcmcia_state *
}
static int
}
static int
-cerf_pcmcia_configure_socket(struct s
a1100
_pcmcia_socket *skt,
+cerf_pcmcia_configure_socket(struct s
oc
_pcmcia_socket *skt,
const socket_state_t *state)
{
switch (state->Vcc) {
const socket_state_t *state)
{
switch (state->Vcc) {
@@
-78,14
+78,14
@@
cerf_pcmcia_configure_socket(struct sa1100_pcmcia_socket *skt,
return 0;
}
return 0;
}
-static void cerf_pcmcia_socket_init(struct s
a1100
_pcmcia_socket *skt)
+static void cerf_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 cerf_pcmcia_socket_suspend(struct s
a1100
_pcmcia_socket *skt)
+static void cerf_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));
}
static struct pcmcia_low_level cerf_pcmcia_ops = {
}
static struct pcmcia_low_level cerf_pcmcia_ops = {