diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-13 13:08:47 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-13 13:08:47 +0200 |
| commit | a12e61df4fa1cfae7a6b76976fa65a6fcb048e3f (patch) | |
| tree | 957c915298b299902aa80afa7c78e94c71b3dc25 /drivers/pcmcia/sa1100_cerf.c | |
| parent | x86: fix setup code crashes on my old 486 box (diff) | |
| parent | Linux 2.6.27-rc3 (diff) | |
| download | linux-a12e61df4fa1cfae7a6b76976fa65a6fcb048e3f.tar.xz linux-a12e61df4fa1cfae7a6b76976fa65a6fcb048e3f.zip | |
Merge commit 'v2.6.27-rc3' into x86/urgent
Diffstat (limited to 'drivers/pcmcia/sa1100_cerf.c')
| -rw-r--r-- | drivers/pcmcia/sa1100_cerf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/sa1100_cerf.c b/drivers/pcmcia/sa1100_cerf.c index 7c3951a2675d..63e6bc431a0d 100644 --- 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 <asm/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/irq.h> -#include <asm/arch/cerf.h> +#include <mach/cerf.h> #include "sa1100_generic.h" #define CERF_SOCKET 1 |