git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d79b757)
Revert "net: stmmac: Add SOCFPGA glue driver"
authorArnd Bergmann <arnd@arndb.de>
Thu, 27 Mar 2014 00:25:06 +0000 (01:25 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 27 Mar 2014 00:25:06 +0000 (01:25 +0100)
This reverts commit 2d237c06a4161767fe1da598d15291914a7bbeed.

The driver needs other changes, which unfortunately conflict
with patches in the netdev tree. Revert it here so it can
get merged on top of the other driver through netdev.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
drivers/net/ethernet/stmicro/stmmac/Makefile patch | blob | history
drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c [deleted file] patch | blob | history

diff --cc drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
Simple merge
Pandora Kernel Repository