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_freebird.c
diff --git
a/drivers/pcmcia/sa1100_freebird.c
b/drivers/pcmcia/sa1100_freebird.c
index
57c77d9
..
8dd00f0
100644
(file)
--- a/
drivers/pcmcia/sa1100_freebird.c
+++ b/
drivers/pcmcia/sa1100_freebird.c
@@
-20,7
+20,7
@@
static struct pcmcia_irqs irqs[] = {
{ 0, IRQ_GPIO_FREEBIRD_CF_BVD, "CF_BVD1" },
};
{ 0, IRQ_GPIO_FREEBIRD_CF_BVD, "CF_BVD1" },
};
-static int freebird_pcmcia_init(struct s
a1100
_pcmcia_socket *skt)
+static int freebird_pcmcia_init(struct s
oc
_pcmcia_socket *skt)
{
/* Enable Linkup CF card */
LINKUP_PRC = 0xc0;
{
/* Enable Linkup CF card */
LINKUP_PRC = 0xc0;
@@
-35,12
+35,12
@@
static int freebird_pcmcia_init(struct sa1100_pcmcia_socket *skt)
skt->irq = IRQ_GPIO_FREEBIRD_CF_IRQ;
skt->irq = IRQ_GPIO_FREEBIRD_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 freebird_pcmcia_shutdown(struct s
a1100
_pcmcia_socket *skt)
+static void freebird_pcmcia_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);
/* Disable CF card */
LINKUP_PRC = 0x40; /* SSP=1 SOE=0 */
/* Disable CF card */
LINKUP_PRC = 0x40; /* SSP=1 SOE=0 */
@@
-48,7
+48,7
@@
static void freebird_pcmcia_shutdown(struct sa1100_pcmcia_socket *skt)
}
static void
}
static void
-freebird_pcmcia_socket_state(struct s
a1100
_pcmcia_socket *skt, struct pcmcia_state *state)
+freebird_pcmcia_socket_state(struct s
oc
_pcmcia_socket *skt, struct pcmcia_state *state)
{
unsigned long levels = LINKUP_PRS;
// printk("LINKUP_PRS=%x\n",levels);
{
unsigned long levels = LINKUP_PRS;
// printk("LINKUP_PRS=%x\n",levels);
@@
-63,7
+63,7
@@
freebird_pcmcia_socket_state(struct sa1100_pcmcia_socket *skt, struct pcmcia_sta
}
static int
}
static int
-freebird_pcmcia_configure_socket(struct s
a1100
_pcmcia_socket *skt,
+freebird_pcmcia_configure_socket(struct s
oc
_pcmcia_socket *skt,
socket_state_t *state)
{
unsigned long value, flags;
socket_state_t *state)
{
unsigned long value, flags;
@@
-103,14
+103,14
@@
freebird_pcmcia_configure_socket(struct sa1100_pcmcia_socket *skt,
return 0;
}
return 0;
}
-static void freebird_pcmcia_socket_init(struct s
a1100
_pcmcia_socket *skt)
+static void freebird_pcmcia_socket_init(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 void freebird_pcmcia_socket_suspend(struct s
a1100
_pcmcia_socket *skt)
+static void freebird_pcmcia_socket_suspend(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 struct pcmcia_low_level freebird_pcmcia_ops = {
}
static struct pcmcia_low_level freebird_pcmcia_ops = {