diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-20 12:39:18 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-20 12:39:18 +0200 |
| commit | 170465ee7f5a9a2d0ac71285507e52642e040353 (patch) | |
| tree | dbca81f04cde9e625170abbd6a72555cfbeb194e /drivers/pcmcia/sa1100_simpad.c | |
| parent | 169ad16bb87c10a3f7c108bb7008ebc0270f617a (diff) | |
| parent | 1fca25427482387689fa27594c992a961d98768f (diff) | |
| download | talos-op-linux-170465ee7f5a9a2d0ac71285507e52642e040353.tar.gz talos-op-linux-170465ee7f5a9a2d0ac71285507e52642e040353.zip | |
Merge branch 'linus' into x86/xen
Diffstat (limited to 'drivers/pcmcia/sa1100_simpad.c')
| -rw-r--r-- | drivers/pcmcia/sa1100_simpad.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/sa1100_simpad.c b/drivers/pcmcia/sa1100_simpad.c index 42567de894b9..33a08ae09fdf 100644 --- a/drivers/pcmcia/sa1100_simpad.c +++ b/drivers/pcmcia/sa1100_simpad.c @@ -9,10 +9,10 @@ #include <linux/device.h> #include <linux/init.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/irq.h> -#include <asm/arch/simpad.h> +#include <mach/simpad.h> #include "sa1100_generic.h" extern long get_cs3_shadow(void); |
