Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59a54f30 authored by Michal Simek's avatar Michal Simek Committed by David S. Miller
Browse files

drivers/net/ethernet/xilinx/axi ethernet: Correct Copyright 



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: default avatarMichal Simek <monstr@monstr.eu>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a8c9cb10

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -7577,8 +7577,8 @@ F: Documentation/filesystems/xfs.txt 
F:	fs/xfs/



XILINX AXI ETHERNET DRIVER

M:	Ariane Keller <ariane.keller@tik.ee.ethz.ch>

M:	Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch>

M:	Anirudha Sarangi <anirudh@xilinx.com>

M:	John Linn <John.Linn@xilinx.com>

S:	Maintained

F:	drivers/net/ethernet/xilinx/xilinx_axienet*

drivers/net/ethernet/xilinx/xilinx_axienet.h

+1 −3
Original line number Diff line number Diff line
@@ -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, <daniel.borkmann@tik.ee.ethz.ch>

 * Copyright (c) 2012 Ariane Keller, <ariane.keller@tik.ee.ethz.ch>

 * Copyright (c) 2010 - 2012 Xilinx, Inc. All rights reserved.

 */



#ifndef XILINX_AXIENET_H

drivers/net/ethernet/xilinx/xilinx_axienet_main.c

+3 −3
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ 
 * Copyright (c) 2008 Nissin Systems Co., Ltd.,  Yoshio Kashiwagi

 * Copyright (c) 2005-2008 DLA Systems,  David H. Lynch Jr. <dhlii@dlasys.net>

 * Copyright (c) 2008-2009 Secret Lab Technologies Ltd.

 * Copyright (c) 2010 Xilinx, Inc. All rights reserved.

 * Copyright (c) 2012 Daniel Borkmann, <daniel.borkmann@tik.ee.ethz.ch>

 * Copyright (c) 2012 Ariane Keller, <ariane.keller@tik.ee.ethz.ch>

 * Copyright (c) 2010 - 2011 Michal Simek <monstr@monstr.eu>

 * 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.

drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c

+3 −3
Original line number Diff line number Diff line
@@ -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, <daniel.borkmann@tik.ee.ethz.ch>

 * Copyright (c) 2012 Ariane Keller, <ariane.keller@tik.ee.ethz.ch>

 * Copyright (c) 2010 - 2011 Michal Simek <monstr@monstr.eu>

 * Copyright (c) 2010 - 2011 PetaLogix

 * Copyright (c) 2010 - 2012 Xilinx, Inc. All rights reserved.

 */



#include <linux/of_address.h>