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
patch-2_6_7-vs1_9_1_12
[linux-2.6.git]
/
drivers
/
pcmcia
/
sa1100_assabet.c
diff --git
a/drivers/pcmcia/sa1100_assabet.c
b/drivers/pcmcia/sa1100_assabet.c
index
884a655
..
7c57fdd
100644
(file)
--- a/
drivers/pcmcia/sa1100_assabet.c
+++ b/
drivers/pcmcia/sa1100_assabet.c
@@
-25,23
+25,23
@@
static struct pcmcia_irqs irqs[] = {
{ 1, ASSABET_IRQ_GPIO_CF_BVD1, "CF BVD1" },
};
{ 1, ASSABET_IRQ_GPIO_CF_BVD1, "CF BVD1" },
};
-static int assabet_pcmcia_hw_init(struct s
a1100
_pcmcia_socket *skt)
+static int assabet_pcmcia_hw_init(struct s
oc
_pcmcia_socket *skt)
{
skt->irq = ASSABET_IRQ_GPIO_CF_IRQ;
{
skt->irq = ASSABET_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));
}
/*
* Release all resources.
*/
}
/*
* Release all resources.
*/
-static void assabet_pcmcia_hw_shutdown(struct s
a1100
_pcmcia_socket *skt)
+static void assabet_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
-assabet_pcmcia_socket_state(struct s
a1100
_pcmcia_socket *skt, struct pcmcia_state *state)
+assabet_pcmcia_socket_state(struct s
oc
_pcmcia_socket *skt, struct pcmcia_state *state)
{
unsigned long levels = GPLR;
{
unsigned long levels = GPLR;
@@
-55,7
+55,7
@@
assabet_pcmcia_socket_state(struct sa1100_pcmcia_socket *skt, struct pcmcia_stat
}
static int
}
static int
-assabet_pcmcia_configure_socket(struct s
a1100
_pcmcia_socket *skt, const socket_state_t *state)
+assabet_pcmcia_configure_socket(struct s
oc
_pcmcia_socket *skt, const socket_state_t *state)
{
unsigned int mask;
{
unsigned int mask;
@@
-93,22
+93,22
@@
assabet_pcmcia_configure_socket(struct sa1100_pcmcia_socket *skt, const socket_s
* be called at initialisation, power management event, or
* pcmcia event.
*/
* be called at initialisation, power management event, or
* pcmcia event.
*/
-static void assabet_pcmcia_socket_init(struct s
a1100
_pcmcia_socket *skt)
+static void assabet_pcmcia_socket_init(struct s
oc
_pcmcia_socket *skt)
{
/*
* Enable CF bus
*/
ASSABET_BCR_clear(ASSABET_BCR_CF_BUS_OFF);
{
/*
* Enable CF bus
*/
ASSABET_BCR_clear(ASSABET_BCR_CF_BUS_OFF);
- s
a11xx
_enable_irqs(skt, irqs, ARRAY_SIZE(irqs));
+ s
oc_pcmcia
_enable_irqs(skt, irqs, ARRAY_SIZE(irqs));
}
/*
* Disable card status IRQs on suspend.
*/
}
/*
* Disable card status IRQs on suspend.
*/
-static void assabet_pcmcia_socket_suspend(struct s
a1100
_pcmcia_socket *skt)
+static void assabet_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));
/*
* Tristate the CF bus signals. Also assert CF
/*
* Tristate the CF bus signals. Also assert CF