diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-10 16:29:28 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-10 16:29:28 +0100 |
| commit | 39aef29414d77492e06d872cfeaf4ba744fa9d38 (patch) | |
| tree | 708ee5f6f46f5bd2db6c4ec1cce2a1922df4076a /target/linux/patches/3.13.6/microblaze-axi.patch | |
| parent | ed3d91cf2dfc6f63ae749b54c7d718eb73dd6211 (diff) | |
| parent | 6e58f05aaae4943de494bc30dd3bf184a6d676f2 (diff) | |
resolve conflict
Diffstat (limited to 'target/linux/patches/3.13.6/microblaze-axi.patch')
| -rw-r--r-- | target/linux/patches/3.13.6/microblaze-axi.patch | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/target/linux/patches/3.13.6/microblaze-axi.patch b/target/linux/patches/3.13.6/microblaze-axi.patch new file mode 100644 index 000000000..1a4b17d8c --- /dev/null +++ b/target/linux/patches/3.13.6/microblaze-axi.patch @@ -0,0 +1,11 @@ +diff -Nur linux-3.13.3.orig/drivers/net/ethernet/xilinx/xilinx_axienet_main.c linux-3.13.3/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +--- linux-3.13.3.orig/drivers/net/ethernet/xilinx/xilinx_axienet_main.c 2014-02-13 23:00:14.000000000 +0100 ++++ linux-3.13.3/drivers/net/ethernet/xilinx/xilinx_axienet_main.c 2014-02-24 08:03:57.000000000 +0100 +@@ -25,6 +25,7 @@ + #include <linux/init.h> + #include <linux/module.h> + #include <linux/netdevice.h> ++#include <linux/of_irq.h> + #include <linux/of_mdio.h> + #include <linux/of_platform.h> + #include <linux/of_address.h> |