From 708a1f05a8f6ee97b9b0a4f4948162d45a1f40d6 Mon Sep 17 00:00:00 2001 From: Daniel Borkmann Date: Thu, 19 Jan 2012 11:18:36 +0100 Subject: [PATCH] patches: fixed patch --- microblaze/patches/xilinx_axi.patch | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/microblaze/patches/xilinx_axi.patch b/microblaze/patches/xilinx_axi.patch index 3c8147f..5e37293 100644 --- a/microblaze/patches/xilinx_axi.patch +++ b/microblaze/patches/xilinx_axi.patch @@ -2,19 +2,26 @@ Against net-next, rev 356b95424cfb456e14a59eaa579422ce014c424b Signed-off-by: Ariane Keller Signed-off-by: Daniel Borkmann +--- + MAINTAINERS | 6 + + drivers/net/ethernet/xilinx/Kconfig | 8 + + drivers/net/ethernet/xilinx/Makefile | 2 + + drivers/net/ethernet/xilinx/xilinx_axienet.h | 508 +++++++ + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 1682 +++++++++++++++++++++ + drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 238 +++ + 6 files changed, 2444 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 4babed7..4d0b9f7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -7459,6 +7459,13 @@ S: Supported +@@ -7459,6 +7459,12 @@ S: Supported F: Documentation/filesystems/xfs.txt F: fs/xfs/ +XILINX AXI ETHERNET DRIVER +M: Ariane Keller +M: Daniel Borkmann -+W: http://www.gnumaniacs.org/ +S: Maintained +F: drivers/net/ethernet/xilinx/xilinx_axienet* + @@ -569,7 +576,7 @@ new file mode 100644 index 0000000..7fe9a1b --- /dev/null +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c -@@ -0,0 +1,1683 @@ +@@ -0,0 +1,1682 @@ +/* + * Xilinx Axi Ethernet device driver + * @@ -2252,7 +2259,6 @@ index 0000000..7fe9a1b +MODULE_DESCRIPTION("Xilinx Axi Ethernet driver"); +MODULE_AUTHOR("Xilinx"); +MODULE_LICENSE("GPL"); -+ diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c new file mode 100644 index 0000000..d70b6e7 -- 2.11.4.GIT