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/net/smc91x.h | |
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/net/smc91x.h')
-rw-r--r-- | drivers/net/smc91x.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index 22209b6f1405..997e7f1d5c6e 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h | |||
@@ -187,7 +187,7 @@ static inline void SMC_outw(u16 val, void __iomem *ioaddr, int reg) | |||
187 | 187 | ||
188 | #elif defined(CONFIG_SA1100_ASSABET) | 188 | #elif defined(CONFIG_SA1100_ASSABET) |
189 | 189 | ||
190 | #include <asm/arch/neponset.h> | 190 | #include <mach/neponset.h> |
191 | 191 | ||
192 | /* We can only do 8-bit reads and writes in the static memory space. */ | 192 | /* We can only do 8-bit reads and writes in the static memory space. */ |
193 | #define SMC_CAN_USE_8BIT 1 | 193 | #define SMC_CAN_USE_8BIT 1 |
@@ -339,7 +339,7 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg) | |||
339 | * IOBARRIER on entry to their ISR. | 339 | * IOBARRIER on entry to their ISR. |
340 | */ | 340 | */ |
341 | 341 | ||
342 | #include <asm/arch/constants.h> /* IOBARRIER_VIRT */ | 342 | #include <mach/constants.h> /* IOBARRIER_VIRT */ |
343 | 343 | ||
344 | #define SMC_CAN_USE_8BIT 0 | 344 | #define SMC_CAN_USE_8BIT 0 |
345 | #define SMC_CAN_USE_16BIT 1 | 345 | #define SMC_CAN_USE_16BIT 1 |
@@ -525,7 +525,7 @@ struct smc_local { | |||
525 | */ | 525 | */ |
526 | #include <linux/dma-mapping.h> | 526 | #include <linux/dma-mapping.h> |
527 | #include <asm/dma.h> | 527 | #include <asm/dma.h> |
528 | #include <asm/arch/pxa-regs.h> | 528 | #include <mach/pxa-regs.h> |
529 | 529 | ||
530 | #ifdef SMC_insl | 530 | #ifdef SMC_insl |
531 | #undef SMC_insl | 531 | #undef SMC_insl |