git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-20180825' of git://git.kernel.dk/linux-block
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
ethernet
/
smsc
/
smc91x.h
diff --git
a/drivers/net/ethernet/smsc/smc91x.h
b/drivers/net/ethernet/smsc/smc91x.h
index b337ee97e0c0c7eaa0a51e9a067b13420b789aa4..a27352229fc216cd75b44d932943ad1befa1cfe0 100644
(file)
--- a/
drivers/net/ethernet/smsc/smc91x.h
+++ b/
drivers/net/ethernet/smsc/smc91x.h
@@
-301,7
+301,6
@@
struct smc_local {
* as RX which can overrun memory and lose packets.
*/
#include <linux/dma-mapping.h>
-#include <linux/dma/pxa-dma.h>
#ifdef SMC_insl
#undef SMC_insl