diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-14 06:19:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-14 06:19:59 -0400 |
| commit | 8d7ccaa545490cdffdfaff0842436a8dd85cf47b (patch) | |
| tree | 8129b5907161bc6ae26deb3645ce1e280c5e1f51 /drivers/net/smc911x.h | |
| parent | b2139aa0eec330c711c5a279db361e5ef1178e78 (diff) | |
| parent | 30a2f3c60a84092c8084dfe788b710f8d0768cd4 (diff) | |
Merge commit 'v2.6.27-rc3' into x86/prototypes
Conflicts:
include/asm-x86/dma-mapping.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/smc911x.h')
| -rw-r--r-- | drivers/net/smc911x.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h index 76c17c28fab4..2abfc2845198 100644 --- a/drivers/net/smc911x.h +++ b/drivers/net/smc911x.h | |||
| @@ -222,7 +222,7 @@ static inline void SMC_outsl(struct smc911x_local *lp, int reg, | |||
| 222 | */ | 222 | */ |
| 223 | #include <linux/dma-mapping.h> | 223 | #include <linux/dma-mapping.h> |
| 224 | #include <asm/dma.h> | 224 | #include <asm/dma.h> |
| 225 | #include <asm/arch/pxa-regs.h> | 225 | #include <mach/pxa-regs.h> |
| 226 | 226 | ||
| 227 | static dma_addr_t rx_dmabuf, tx_dmabuf; | 227 | static dma_addr_t rx_dmabuf, tx_dmabuf; |
| 228 | static int rx_dmalen, tx_dmalen; | 228 | static int rx_dmalen, tx_dmalen; |