Skip to content

Commit

Permalink
drivers/net/ethernet/xilinx/axi ethernet: Correct Copyright
Browse files Browse the repository at this point in the history
Also fix MAINTAINERS file to reflect autorship.

Daniel and Ariane changed coding style but not any functional changes in the driver
itself.

Signed-off-by: Michal Simek <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
michalsimek authored and davem330 committed Apr 13, 2012
1 parent a8c9cb1 commit 59a54f3
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 11 deletions.
4 changes: 2 additions & 2 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -7577,8 +7577,8 @@ F: Documentation/filesystems/xfs.txt
F: fs/xfs/

XILINX AXI ETHERNET DRIVER
M: Ariane Keller <[email protected]>
M: Daniel Borkmann <[email protected]>
M: Anirudha Sarangi <[email protected]>
M: John Linn <[email protected]>
S: Maintained
F: drivers/net/ethernet/xilinx/xilinx_axienet*

Expand Down
4 changes: 1 addition & 3 deletions drivers/net/ethernet/xilinx/xilinx_axienet.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
* Definitions for Xilinx Axi Ethernet device driver.
*
* Copyright (c) 2009 Secret Lab Technologies, Ltd.
* Copyright (c) 2010 Xilinx, Inc. All rights reserved.
* Copyright (c) 2012 Daniel Borkmann, <[email protected]>
* Copyright (c) 2012 Ariane Keller, <[email protected]>
* Copyright (c) 2010 - 2012 Xilinx, Inc. All rights reserved.
*/

#ifndef XILINX_AXIENET_H
Expand Down
6 changes: 3 additions & 3 deletions drivers/net/ethernet/xilinx/xilinx_axienet_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
* Copyright (c) 2008 Nissin Systems Co., Ltd., Yoshio Kashiwagi
* Copyright (c) 2005-2008 DLA Systems, David H. Lynch Jr. <[email protected]>
* Copyright (c) 2008-2009 Secret Lab Technologies Ltd.
* Copyright (c) 2010 Xilinx, Inc. All rights reserved.
* Copyright (c) 2012 Daniel Borkmann, <[email protected]>
* Copyright (c) 2012 Ariane Keller, <[email protected]>
* Copyright (c) 2010 - 2011 Michal Simek <[email protected]>
* Copyright (c) 2010 - 2011 PetaLogix
* Copyright (c) 2010 - 2012 Xilinx, Inc. All rights reserved.
*
* This is a driver for the Xilinx Axi Ethernet which is used in the Virtex6
* and Spartan6.
Expand Down
6 changes: 3 additions & 3 deletions drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
* MDIO bus driver for the Xilinx Axi Ethernet device
*
* Copyright (c) 2009 Secret Lab Technologies, Ltd.
* Copyright (c) 2010 Xilinx, Inc. All rights reserved.
* Copyright (c) 2012 Daniel Borkmann, <[email protected]>
* Copyright (c) 2012 Ariane Keller, <[email protected]>
* Copyright (c) 2010 - 2011 Michal Simek <[email protected]>
* Copyright (c) 2010 - 2011 PetaLogix
* Copyright (c) 2010 - 2012 Xilinx, Inc. All rights reserved.
*/

#include <linux/of_address.h>
Expand Down

0 comments on commit 59a54f3

Please sign in to comment.