projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' into for-linus
[linux-2.6-block.git]
/
drivers
/
pcmcia
/
sa1100_cerf.c
diff --git
a/drivers/pcmcia/sa1100_cerf.c
b/drivers/pcmcia/sa1100_cerf.c
index 7c3951a2675dd2c5ba8ff3b0194a8ac865294a7d..63e6bc431a0d71fa5cc847d2637818db44cc211e 100644
(file)
--- a/
drivers/pcmcia/sa1100_cerf.c
+++ b/
drivers/pcmcia/sa1100_cerf.c
@@
-11,10
+11,10
@@
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/delay.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
-#include <
asm/ar
ch/cerf.h>
+#include <
ma
ch/cerf.h>
#include "sa1100_generic.h"
#define CERF_SOCKET 1
#include "sa1100_generic.h"
#define CERF_SOCKET 1