diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-05 11:14:15 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:55:48 -0400 |
| commit | a09e64fbc0094e3073dbb09c3b4bfe4ab669244b (patch) | |
| tree | 69689f467179891b498bd7423fcf61925173db31 /drivers/pcmcia/soc_common.c | |
| parent | a1b81a84fff05dbfef45b7012c26e1fee9973e5d (diff) | |
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
This just leaves include/asm-arm/plat-* to deal with.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/pcmcia/soc_common.c')
| -rw-r--r-- | drivers/pcmcia/soc_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c index 95dff38e85f5..c48f3f69bdaf 100644 --- a/drivers/pcmcia/soc_common.c +++ b/drivers/pcmcia/soc_common.c | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | #include <linux/spinlock.h> | 43 | #include <linux/spinlock.h> |
| 44 | #include <linux/cpufreq.h> | 44 | #include <linux/cpufreq.h> |
| 45 | 45 | ||
| 46 | #include <asm/arch/hardware.h> | 46 | #include <mach/hardware.h> |
| 47 | #include <asm/io.h> | 47 | #include <asm/io.h> |
| 48 | #include <asm/system.h> | 48 | #include <asm/system.h> |
| 49 | 49 | ||
| @@ -51,7 +51,7 @@ | |||
| 51 | 51 | ||
| 52 | /* FIXME: platform dependent resource declaration has to move out of this file */ | 52 | /* FIXME: platform dependent resource declaration has to move out of this file */ |
| 53 | #ifdef CONFIG_ARCH_PXA | 53 | #ifdef CONFIG_ARCH_PXA |
| 54 | #include <asm/arch/pxa-regs.h> | 54 | #include <mach/pxa-regs.h> |
| 55 | #endif | 55 | #endif |
| 56 | 56 | ||
| 57 | #ifdef DEBUG | 57 | #ifdef DEBUG |