projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
[cascardo/linux.git]
/
drivers
/
pcmcia
/
sa1111_jornada720.c
diff --git
a/drivers/pcmcia/sa1111_jornada720.c
b/drivers/pcmcia/sa1111_jornada720.c
index
40e0403
..
c2c3058
100644
(file)
--- a/
drivers/pcmcia/sa1111_jornada720.c
+++ b/
drivers/pcmcia/sa1111_jornada720.c
@@
-92,10
+92,9
@@
static struct pcmcia_low_level jornada720_pcmcia_ops = {
.nr = 2,
};
.nr = 2,
};
-int pcmcia_jornada720_init(struct
device *
dev)
+int pcmcia_jornada720_init(struct
sa1111_dev *sa
dev)
{
int ret = -ENODEV;
{
int ret = -ENODEV;
- struct sa1111_dev *sadev = SA1111_DEV(dev);
if (machine_is_jornada720()) {
unsigned int pin = GPIO_A0 | GPIO_A1 | GPIO_A2 | GPIO_A3;
if (machine_is_jornada720()) {
unsigned int pin = GPIO_A0 | GPIO_A1 | GPIO_A2 | GPIO_A3;