diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-15 13:19:04 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-15 13:19:04 -0400 |
| commit | 56845d78cee8576a8160cee8aeac62efdb561ae2 (patch) | |
| tree | f891afed5324d359da1713a80a7131968373acc4 /drivers/net/ethernet/xilinx/xilinx_axienet.h | |
| parent | df8ef8f3aaa6692970a436204c4429210addb23a (diff) | |
| parent | 8a9a0ea6032186e3030419262678d652b88bf6a8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/atheros/atlx/atl1.c
drivers/net/ethernet/atheros/atlx/atl1.h
Resolved a conflict between a DMA error bug fix and NAPI
support changes in the atl1 driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/xilinx/xilinx_axienet.h')
| -rw-r--r-- | drivers/net/ethernet/xilinx/xilinx_axienet.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet.h b/drivers/net/ethernet/xilinx/xilinx_axienet.h index cc83af083fd7..44b8d2bad8c3 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet.h +++ b/drivers/net/ethernet/xilinx/xilinx_axienet.h | |||
| @@ -2,9 +2,7 @@ | |||
| 2 | * Definitions for Xilinx Axi Ethernet device driver. | 2 | * Definitions for Xilinx Axi Ethernet device driver. |
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2009 Secret Lab Technologies, Ltd. | 4 | * Copyright (c) 2009 Secret Lab Technologies, Ltd. |
| 5 | * Copyright (c) 2010 Xilinx, Inc. All rights reserved. | 5 | * Copyright (c) 2010 - 2012 Xilinx, Inc. All rights reserved. |
| 6 | * Copyright (c) 2012 Daniel Borkmann, <daniel.borkmann@tik.ee.ethz.ch> | ||
| 7 | * Copyright (c) 2012 Ariane Keller, <ariane.keller@tik.ee.ethz.ch> | ||
| 8 | */ | 6 | */ |
| 9 | 7 | ||
| 10 | #ifndef XILINX_AXIENET_H | 8 | #ifndef XILINX_AXIENET_H |