Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 268686
b: refs/heads/master
c: 86d734f
h: refs/heads/master
v: v3
  • Loading branch information
Mark Einon authored and Greg Kroah-Hartman committed Oct 4, 2011
1 parent 6a4e97f commit a554ec3
Show file tree
Hide file tree
Showing 17 changed files with 32 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 92c31a43e15a9ae1535ac234ab444a265fd0775c
refs/heads/master: 86d734fd1e8edcab411c80ae4447c97317f8d8b5
2 changes: 2 additions & 0 deletions trunk/drivers/staging/et131x/et1310_address_map.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
* All rights reserved.
* http://www.agere.com
*
* Copyright (c) 2011 Mark Einon <mark.einon@gmail.com>
*
*------------------------------------------------------------------------------
*
* et1310_address_map.h - Contains the register mapping for the ET1310
Expand Down
2 changes: 2 additions & 0 deletions trunk/drivers/staging/et131x/et1310_eeprom.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
* All rights reserved.
* http://www.agere.com
*
* Copyright (c) 2011 Mark Einon <mark.einon@gmail.com>
*
*------------------------------------------------------------------------------
*
* et1310_eeprom.c - Code used to access the device's EEPROM
Expand Down
2 changes: 2 additions & 0 deletions trunk/drivers/staging/et131x/et1310_mac.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
* All rights reserved.
* http://www.agere.com
*
* Copyright (c) 2011 Mark Einon <mark.einon@gmail.com>
*
*------------------------------------------------------------------------------
*
* et1310_mac.c - All code and routines pertaining to the MAC
Expand Down
2 changes: 2 additions & 0 deletions trunk/drivers/staging/et131x/et1310_phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
* All rights reserved.
* http://www.agere.com
*
* Copyright (c) 2011 Mark Einon <mark.einon@gmail.com>
*
*------------------------------------------------------------------------------
*
* et1310_phy.c - Routines for configuring and accessing the PHY
Expand Down
2 changes: 2 additions & 0 deletions trunk/drivers/staging/et131x/et1310_phy.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
* All rights reserved.
* http://www.agere.com
*
* Copyright (c) 2011 Mark Einon <mark.einon@gmail.com>
*
*------------------------------------------------------------------------------
*
* et1310_phy.h - Defines, structs, enums, prototypes, etc. pertaining to the
Expand Down
2 changes: 2 additions & 0 deletions trunk/drivers/staging/et131x/et1310_pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
* All rights reserved.
* http://www.agere.com
*
* Copyright (c) 2011 Mark Einon <mark.einon@gmail.com>
*
*------------------------------------------------------------------------------
*
* et1310_pm.c - All power management related code (not completely implemented)
Expand Down
2 changes: 2 additions & 0 deletions trunk/drivers/staging/et131x/et1310_rx.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
* All rights reserved.
* http://www.agere.com
*
* Copyright (c) 2011 Mark Einon <mark.einon@gmail.com>
*
*------------------------------------------------------------------------------
*
* et1310_rx.c - Routines used to perform data reception
Expand Down
2 changes: 2 additions & 0 deletions trunk/drivers/staging/et131x/et1310_rx.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
* All rights reserved.
* http://www.agere.com
*
* Copyright (c) 2011 Mark Einon <mark.einon@gmail.com>
*
*------------------------------------------------------------------------------
*
* et1310_rx.h - Defines, structs, enums, prototypes, etc. pertaining to data
Expand Down
2 changes: 2 additions & 0 deletions trunk/drivers/staging/et131x/et1310_tx.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
* All rights reserved.
* http://www.agere.com
*
* Copyright (c) 2011 Mark Einon <mark.einon@gmail.com>
*
*------------------------------------------------------------------------------
*
* et1310_tx.c - Routines used to perform data transmission.
Expand Down
2 changes: 2 additions & 0 deletions trunk/drivers/staging/et131x/et131x_adapter.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
* All rights reserved.
* http://www.agere.com
*
* Copyright (c) 2011 Mark Einon <mark.einon@gmail.com>
*
*------------------------------------------------------------------------------
*
* et131x_adapter.h - Header which includes the private adapter structure, along
Expand Down
2 changes: 2 additions & 0 deletions trunk/drivers/staging/et131x/et131x_defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
* All rights reserved.
* http://www.agere.com
*
* Copyright (c) 2011 Mark Einon <mark.einon@gmail.com>
*
*------------------------------------------------------------------------------
*
* et131x_defs.h - Defines, structs, enums, prototypes, etc. to assist with OS
Expand Down
4 changes: 1 addition & 3 deletions trunk/drivers/staging/et131x/et131x_ethtool.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2011 Mark Einon
* Copyright (c) 2011 Mark Einon <mark.einon@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand All @@ -14,8 +14,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Mark Einon <mark.einon@gmail.com>
*/
#include "et131x_version.h"
#include "et131x_defs.h"
Expand Down
3 changes: 3 additions & 0 deletions trunk/drivers/staging/et131x/et131x_initpci.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
* All rights reserved.
* http://www.agere.com
*
* Copyright (c) 2011 Mark Einon <mark.einon@gmail.com>
*
*------------------------------------------------------------------------------
*
* et131x_initpci.c - Routines and data used to register the driver with the
Expand Down Expand Up @@ -945,5 +947,6 @@ module_exit(et131x_cleanup_module);

/* Modinfo parameters (filled out using defines from et131x_version.h) */
MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_AUTHOR(DRIVER_AUTHOR2);
MODULE_DESCRIPTION(DRIVER_INFO);
MODULE_LICENSE(DRIVER_LICENSE);
2 changes: 2 additions & 0 deletions trunk/drivers/staging/et131x/et131x_isr.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
* All rights reserved.
* http://www.agere.com
*
* Copyright (c) 2011 Mark Einon <mark.einon@gmail.com>
*
*------------------------------------------------------------------------------
*
* et131x_isr.c - File which contains the ISR, ISR handler, and related routines
Expand Down
2 changes: 2 additions & 0 deletions trunk/drivers/staging/et131x/et131x_netdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
* All rights reserved.
* http://www.agere.com
*
* Copyright (c) 2011 Mark Einon <mark.einon@gmail.com>
*
*------------------------------------------------------------------------------
*
* et131x_netdev.c - Routines and data required by all Linux network devices.
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/staging/et131x/et131x_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
#define __ET131X_VERSION_H__

#define DRIVER_AUTHOR "Victor Soriano (vjsoriano@agere.com)"
#define DRIVER_AUTHOR2 "Mark Einon (mark.einon@gmail.com)"
#define DRIVER_LICENSE "Dual BSD/GPL"
#define DRIVER_DEVICE_STRING "ET1310"
#define DRIVER_NAME "et131x"
Expand Down

0 comments on commit a554ec3

Please sign in to comment.