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 'powerpc-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
ethernet
/
freescale
/
fs_enet
/
fs_enet.h
diff --git
a/drivers/net/ethernet/freescale/fs_enet/fs_enet.h
b/drivers/net/ethernet/freescale/fs_enet/fs_enet.h
index 759bb7080e22ad903028c786ac4b12ca1fd2af7a..21c07ac05225ffd52831cfc7667bf7a6d8013740 100644
(file)
--- a/
drivers/net/ethernet/freescale/fs_enet/fs_enet.h
+++ b/
drivers/net/ethernet/freescale/fs_enet/fs_enet.h
@@
-10,8
+10,6
@@
#include <linux/phy.h>
#include <linux/dma-mapping.h>
-#include <asm/fs_pd.h>
-
#ifdef CONFIG_CPM1
#include <asm/cpm1.h>
#endif