git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pcmcia: blackfin: fix bug - add missing ; to MODULE macro
[safe/jmp/linux-2.6]
/
drivers
/
pcmcia
/
at91_cf.c
diff --git
a/drivers/pcmcia/at91_cf.c
b/drivers/pcmcia/at91_cf.c
index
6849685
..
9e1140f
100644
(file)
--- a/
drivers/pcmcia/at91_cf.c
+++ b/
drivers/pcmcia/at91_cf.c
@@
-18,13
+18,13
@@
#include <pcmcia/ss.h>
#include <pcmcia/ss.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
#include <asm/io.h>
#include <asm/sizes.h>
#include <asm/gpio.h>
#include <asm/io.h>
#include <asm/sizes.h>
#include <asm/gpio.h>
-#include <
asm/ar
ch/board.h>
-#include <
asm/ar
ch/at91rm9200_mc.h>
+#include <
ma
ch/board.h>
+#include <
ma
ch/at91rm9200_mc.h>
/*
/*
@@
-273,7
+273,7
@@
static int __init at91_cf_probe(struct platform_device *pdev)
goto fail0d;
cf->socket.pci_irq = board->irq_pin;
} else
goto fail0d;
cf->socket.pci_irq = board->irq_pin;
} else
- cf->socket.pci_irq =
NR_IRQS
+ 1;
+ cf->socket.pci_irq =
nr_irqs
+ 1;
/* pcmcia layer only remaps "real" memory not iospace */
cf->socket.io_offset = (unsigned long)
/* pcmcia layer only remaps "real" memory not iospace */
cf->socket.io_offset = (unsigned long)