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_graphicsclient.c
diff --git
a/drivers/pcmcia/sa1100_graphicsclient.c
b/drivers/pcmcia/sa1100_graphicsclient.c
index
0960b48
..
08b5a9d
100644
(file)
--- a/
drivers/pcmcia/sa1100_graphicsclient.c
+++ b/
drivers/pcmcia/sa1100_graphicsclient.c
@@
-38,7
+38,7
@@
static struct pcmcia_irqs irqs[] = {
{ 0, S0_CD_IRQ, "PCMCIA 0 CD" },
};
{ 0, S0_CD_IRQ, "PCMCIA 0 CD" },
};
-static int gcplus_pcmcia_init(struct s
a1100
_pcmcia_socket *skt)
+static int gcplus_pcmcia_init(struct s
oc
_pcmcia_socket *skt)
{
// Reset PCMCIA
// Reset Timing for CPLD(U2) version 8001E or later
{
// Reset PCMCIA
// Reset Timing for CPLD(U2) version 8001E or later
@@
-54,10
+54,10
@@
static int gcplus_pcmcia_init(struct sa1100_pcmcia_socket *skt)
skt->irq = S0_STS_IRQ;
/* Register interrupts */
skt->irq = S0_STS_IRQ;
/* Register interrupts */
- return s
a11xx
_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
+ return s
oc_pcmcia
_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
}
}
-static void gcplus_pcmcia_hw_shutdown(struct s
a1100
_pcmcia_socket *skt)
+static void gcplus_pcmcia_hw_shutdown(struct s
oc
_pcmcia_socket *skt)
{
/* disable IRQs */
free_irq(S0_CD_IRQ, skt);
{
/* disable IRQs */
free_irq(S0_CD_IRQ, skt);
@@
-68,7
+68,7
@@
static void gcplus_pcmcia_hw_shutdown(struct sa1100_pcmcia_socket *skt)
}
static void
}
static void
-gcplus_pcmcia_socket_state(struct s
a1100
_pcmcia_socket *skt, struct pcmcia_state *state)
+gcplus_pcmcia_socket_state(struct s
oc
_pcmcia_socket *skt, struct pcmcia_state *state)
{
unsigned long levels = *PCMCIA_Status;
{
unsigned long levels = *PCMCIA_Status;
@@
-82,7
+82,7
@@
gcplus_pcmcia_socket_state(struct sa1100_pcmcia_socket *skt, struct pcmcia_state
}
static int
}
static int
-gcplus_pcmcia_configure_socket(struct s
a1100
_pcmcia_socket *skt,
+gcplus_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;
@@
-125,11
+125,11
@@
gcplus_pcmcia_configure_socket(struct sa1100_pcmcia_socket *skt,
return 0;
}
return 0;
}
-static void gcplus_pcmcia_socket_init(struct s
a1100
_pcmcia_socket *skt)
+static void gcplus_pcmcia_socket_init(struct s
oc
_pcmcia_socket *skt)
{
}
{
}
-static void gcplus_pcmcia_socket_suspend(struct s
a1100
_pcmcia_socket *skt)
+static void gcplus_pcmcia_socket_suspend(struct s
oc
_pcmcia_socket *skt)
{
}
{
}