From 100d017930542ae237b4616d293e141bc88d49a8 Mon Sep 17 00:00:00 2001
From: Jaswinder Singh Rajput <jaswinder@kernel.org>
Date: Sun, 9 Aug 2009 03:12:38 +0000
Subject: [PATCH] --- yaml --- r: 159463 b: refs/heads/master c:
 f2341641766af3de18502abb6ac9b98e0e4c6bdb h: refs/heads/master i:   159461:
 c62ce855baf54090a39b743de7296eb663073396   159459:
 531b2423f0182872ce36596311ad20c0f90da2dc   159455:
 662a2c42fd0fb48557028e43ddc4b279ecb88386 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/smc911x.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e814ee037025..ca0f6817cf38 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aed7df86983ead0af8364fd26d8a9609ef2ed584
+refs/heads/master: f2341641766af3de18502abb6ac9b98e0e4c6bdb
diff --git a/trunk/drivers/net/smc911x.h b/trunk/drivers/net/smc911x.h
index 8140f7cb4d85..05adb6a666cf 100644
--- a/trunk/drivers/net/smc911x.h
+++ b/trunk/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;