projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.25' of git://git.kernel.dk/linux-2.6-block
[powerpc.git]
/
drivers
/
pcmcia
/
au1000_xxs1500.c
diff --git
a/drivers/pcmcia/au1000_xxs1500.c
b/drivers/pcmcia/au1000_xxs1500.c
index
01874b0
..
ce9d5c4
100644
(file)
--- a/
drivers/pcmcia/au1000_xxs1500.c
+++ b/
drivers/pcmcia/au1000_xxs1500.c
@@
-50,7
+50,10
@@
#include <asm/au1000.h>
#include <asm/au1000_pcmcia.h>
#include <asm/au1000.h>
#include <asm/au1000_pcmcia.h>
-#include <asm/xxs1500.h>
+
+#define PCMCIA_MAX_SOCK 0
+#define PCMCIA_NUM_SOCKS (PCMCIA_MAX_SOCK + 1)
+#define PCMCIA_IRQ AU1000_GPIO_4
#if 0
#define DEBUG(x,args...) printk(__FUNCTION__ ": " x,##args)
#if 0
#define DEBUG(x,args...) printk(__FUNCTION__ ": " x,##args)