diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-15 14:18:15 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-15 14:18:15 +0400 |
| commit | dca2d6ac09d9ef59ff46820d4f0c94b08a671202 (patch) | |
| tree | fdec753b842dad09e3a4151954fab3eb5c43500d /drivers/net/smc911x.h | |
| parent | d6a65dffb30d8636b1e5d4c201564ef401a246cf (diff) | |
| parent | 18240904960a39e582ced8ba8ececb10b8c22dd3 (diff) | |
| download | linux-dca2d6ac09d9ef59ff46820d4f0c94b08a671202.tar.xz | |
Merge branch 'linus' into tracing/hw-breakpoints
Conflicts:
arch/x86/kernel/process_64.c
Semantic conflict fixed in:
arch/x86/kvm/x86.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/smc911x.h')
| -rw-r--r-- | drivers/net/smc911x.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h index 8140f7cb4d85..05adb6a666cf 100644 --- a/drivers/net/smc911x.h +++ b/drivers/net/smc911x.h @@ -236,7 +236,6 @@ static inline void SMC_outsl(struct smc911x_local *lp, int reg, * Use a DMA for RX and TX packets. */ #include <linux/dma-mapping.h> -#include <mach/dma.h> static dma_addr_t rx_dmabuf, tx_dmabuf; static int rx_dmalen, tx_dmalen; |