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_pangolin.c
diff --git
a/drivers/pcmcia/sa1100_pangolin.c
b/drivers/pcmcia/sa1100_pangolin.c
index
c32504b
..
44d19f2
100644
(file)
--- a/
drivers/pcmcia/sa1100_pangolin.c
+++ b/
drivers/pcmcia/sa1100_pangolin.c
@@
-26,7
+26,7
@@
static struct pcmcia_irqs irqs[] = {
{ PANGOLIN_SOCK, IRQ_PCMCIA_CD, "PCMCIA CD" },
};
{ PANGOLIN_SOCK, IRQ_PCMCIA_CD, "PCMCIA CD" },
};
-static int pangolin_pcmcia_hw_init(struct s
a1100
_pcmcia_socket *skt)
+static int pangolin_pcmcia_hw_init(struct s
oc
_pcmcia_socket *skt)
{
int res;
{
int res;
@@
-37,12
+37,12
@@
static int pangolin_pcmcia_hw_init(struct sa1100_pcmcia_socket *skt)
skt->irq = IRQ_PCMCIA_IRQ;
skt->irq = IRQ_PCMCIA_IRQ;
- return s
a11xx
_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
+ return s
oc_pcmcia
_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
}
}
-static void pangolin_pcmcia_hw_shutdown(struct s
a1100
_pcmcia_socket *skt)
+static void pangolin_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));
#ifndef CONFIG_SA1100_PANGOLIN_PCMCIA_IDE
/* Disable PCMCIA bus: */
#ifndef CONFIG_SA1100_PANGOLIN_PCMCIA_IDE
/* Disable PCMCIA bus: */
@@
-51,7
+51,7
@@
static void pangolin_pcmcia_hw_shutdown(struct sa1100_pcmcia_socket *skt)
}
static void
}
static void
-pangolin_pcmcia_socket_state(struct s
a1100
_pcmcia_socket *skt,
+pangolin_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
@@
pangolin_pcmcia_socket_state(struct sa1100_pcmcia_socket *skt,
}
static int
}
static int
-pangolin_pcmcia_configure_socket(struct s
a1100
_pcmcia_socket *skt,
+pangolin_pcmcia_configure_socket(struct s
oc
_pcmcia_socket *skt,
const socket_state_t *state)
{
unsigned long value, flags;
const socket_state_t *state)
{
unsigned long value, flags;
@@
-115,14
+115,14
@@
pangolin_pcmcia_configure_socket(struct sa1100_pcmcia_socket *skt,
return 0;
}
return 0;
}
-static void pangolin_pcmcia_socket_init(struct s
a1100
_pcmcia_socket *skt)
+static void pangolin_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 pangolin_pcmcia_socket_suspend(struct s
a1100
_pcmcia_socket *skt)
+static void pangolin_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 pangolin_pcmcia_ops = {
}
static struct pcmcia_low_level pangolin_pcmcia_ops = {