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_shannon.c
diff --git
a/drivers/pcmcia/sa1100_shannon.c
b/drivers/pcmcia/sa1100_shannon.c
index
959d7e9
..
7bc9e59
100644
(file)
--- a/
drivers/pcmcia/sa1100_shannon.c
+++ b/
drivers/pcmcia/sa1100_shannon.c
@@
-21,7
+21,7
@@
static struct pcmcia_irqs irqs[] = {
{ 1, SHANNON_IRQ_GPIO_EJECT_1, "PCMCIA_CD_1" },
};
{ 1, SHANNON_IRQ_GPIO_EJECT_1, "PCMCIA_CD_1" },
};
-static int shannon_pcmcia_hw_init(struct s
a1100
_pcmcia_socket *skt)
+static int shannon_pcmcia_hw_init(struct s
oc
_pcmcia_socket *skt)
{
/* All those are inputs */
GPDR &= ~(SHANNON_GPIO_EJECT_0 | SHANNON_GPIO_EJECT_1 |
{
/* All those are inputs */
GPDR &= ~(SHANNON_GPIO_EJECT_0 | SHANNON_GPIO_EJECT_1 |
@@
-31,16
+31,16
@@
static int shannon_pcmcia_hw_init(struct sa1100_pcmcia_socket *skt)
skt->irq = skt->nr ? SHANNON_IRQ_GPIO_RDY_1 : SHANNON_IRQ_GPIO_RDY_0;
skt->irq = skt->nr ? SHANNON_IRQ_GPIO_RDY_1 : SHANNON_IRQ_GPIO_RDY_0;
- return s
a11xx
_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
+ return s
oc_pcmcia
_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
}
}
-static void shannon_pcmcia_hw_shutdown(struct s
a1100
_pcmcia_socket *skt)
+static void shannon_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
-shannon_pcmcia_socket_state(struct s
a1100
_pcmcia_socket *skt,
+shannon_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;
@@
-69,7
+69,7
@@
shannon_pcmcia_socket_state(struct sa1100_pcmcia_socket *skt,
}
static int
}
static int
-shannon_pcmcia_configure_socket(struct s
a1100
_pcmcia_socket *skt,
+shannon_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) {
@@
-93,14
+93,14
@@
shannon_pcmcia_configure_socket(struct sa1100_pcmcia_socket *skt,
return 0;
}
return 0;
}
-static void shannon_pcmcia_socket_init(struct s
a1100
_pcmcia_socket *skt)
+static void shannon_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 shannon_pcmcia_socket_suspend(struct s
a1100
_pcmcia_socket *skt)
+static void shannon_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 shannon_pcmcia_ops = {
}
static struct pcmcia_low_level shannon_pcmcia_ops = {