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_xp860.c
diff --git
a/drivers/pcmcia/sa1100_xp860.c
b/drivers/pcmcia/sa1100_xp860.c
index
ea06291
..
eae34b7
100644
(file)
--- a/
drivers/pcmcia/sa1100_xp860.c
+++ b/
drivers/pcmcia/sa1100_xp860.c
@@
-19,7
+19,7
@@
#define NCR_A0VPP (1<<16)
#define NCR_A1VPP (1<<17)
#define NCR_A0VPP (1<<16)
#define NCR_A1VPP (1<<17)
-static int xp860_pcmcia_hw_init(struct s
a1100
_pcmcia_socket *skt)
+static int xp860_pcmcia_hw_init(struct s
oc
_pcmcia_socket *skt)
{
/* Set GPIO_A<3:0> to be outputs for PCMCIA/CF power controller: */
PA_DDR &= ~(GPIO_GPIO0 | GPIO_GPIO1 | GPIO_GPIO2 | GPIO_GPIO3);
{
/* Set GPIO_A<3:0> to be outputs for PCMCIA/CF power controller: */
PA_DDR &= ~(GPIO_GPIO0 | GPIO_GPIO1 | GPIO_GPIO2 | GPIO_GPIO3);
@@
-42,7
+42,7
@@
static int xp860_pcmcia_hw_init(struct sa1100_pcmcia_socket *skt)
}
static int
}
static int
-xp860_pcmcia_configure_socket(struct s
a1100
_pcmcia_socket *skt, const socket_state_t *state)
+xp860_pcmcia_configure_socket(struct s
oc
_pcmcia_socket *skt, const socket_state_t *state)
{
unsigned int gpio_mask, pa_dwr_mask;
unsigned int gpio_set, pa_dwr_set;
{
unsigned int gpio_mask, pa_dwr_mask;
unsigned int gpio_set, pa_dwr_set;