Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-21 02:21:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: et131x: Remove file et131x_version.h

Browse Source 
Removed defines in et131x_version.h and replaced them by actual
strings where convinient, or moved them to et131x.h

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Mark Einon 2011-10-07 22:53:56 +01:00 committed by Greg Kroah-Hartman
parent f247be5d6b
commit b6f4160c4e
12 changed files with 10 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/et131x/et1310_eeprom.c
View File

@ -57,7 +57,6 @@
*
*/
#include "et131x_version.h"
#include "et131x_defs.h"
#include <linux/pci.h>

1
drivers/staging/et131x/et1310_mac.c
View File

@ -57,7 +57,6 @@
*
*/
#include "et131x_version.h"
#include "et131x_defs.h"
#include <linux/init.h>

1
drivers/staging/et131x/et1310_phy.c
View File

@ -57,7 +57,6 @@
*
*/
#include "et131x_version.h"
#include "et131x_defs.h"
#include <linux/pci.h>

1
drivers/staging/et131x/et1310_pm.c
View File

@ -57,7 +57,6 @@
*
*/
#include "et131x_version.h"
#include "et131x_defs.h"
#include <linux/init.h>

1
drivers/staging/et131x/et1310_rx.c
View File

@ -57,7 +57,6 @@
*
*/
#include "et131x_version.h"
#include "et131x_defs.h"
#include <linux/pci.h>

1
drivers/staging/et131x/et1310_tx.c
View File

@ -57,7 +57,6 @@
*
*/
#include "et131x_version.h"
#include "et131x_defs.h"
#include <linux/pci.h>

3
drivers/staging/et131x/et131x.h
View File

@ -48,6 +48,9 @@
*
*/
#define DRIVER_NAME "et131x"
#define DRIVER_VERSION "v2.0"
/* et131x_eeprom.c */
int et131x_init_eeprom(struct et131x_adapter *adapter);

4
drivers/staging/et131x/et131x_ethtool.c
View File

@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "et131x_version.h"
#include "et131x_defs.h"
#include <linux/types.h>
@ -181,7 +181,7 @@ static void et131x_get_drvinfo(struct net_device *netdev,
struct et131x_adapter *adapter = netdev_priv(netdev);
strncpy(info->driver, DRIVER_NAME, ET131X_DRVINFO_LEN);
strncpy(info->version, DRIVER_VERSION_STRING, ET131X_DRVINFO_LEN);
strncpy(info->version, DRIVER_VERSION, ET131X_DRVINFO_LEN);
strncpy(info->bus_info, pci_name(adapter->pdev), ET131X_DRVINFO_LEN);
}

11
drivers/staging/et131x/et131x_initpci.c
View File

@ -59,7 +59,6 @@
*
*/
#include "et131x_version.h"
#include "et131x_defs.h"
#include <linux/pci.h>
@ -944,8 +943,8 @@ static void __exit et131x_cleanup_module(void)
module_init(et131x_init_module);
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);
MODULE_AUTHOR("Victor Soriano <vjsoriano@agere.com>");
MODULE_AUTHOR("Mark Einon <mark.einon@gmail.com>");
MODULE_LICENSE("Dual BSD/GPL");
MODULE_DESCRIPTION("10/100/1000 Base-T Ethernet Driver "
"for the ET1310 by Agere Systems");

1
drivers/staging/et131x/et131x_isr.c
View File

@ -58,7 +58,6 @@
*
*/
#include "et131x_version.h"
#include "et131x_defs.h"
#include <linux/init.h>

1
drivers/staging/et131x/et131x_netdev.c
View File

@ -57,7 +57,6 @@
*
*/
#include "et131x_version.h"
#include "et131x_defs.h"
#include <linux/init.h>

75
drivers/staging/et131x/et131x_version.h
View File

@ -1,75 +0,0 @@
/*
* Agere Systems Inc.
* 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs
*
* Copyright © 2005 Agere Systems Inc.
* All rights reserved.
* http://www.agere.com
*
*------------------------------------------------------------------------------
*
* et131x_version.h - This file provides system and device version information.
*
*------------------------------------------------------------------------------
*
* SOFTWARE LICENSE
*
* This software is provided subject to the following terms and conditions,
* which you should read carefully before using the software. Using this
* software indicates your acceptance of these terms and conditions. If you do
* not agree with these terms and conditions, do not use the software.
*
* Copyright © 2005 Agere Systems Inc.
* All rights reserved.
*
* Redistribution and use in source or binary forms, with or without
* modifications, are permitted provided that the following conditions are met:
*
* . Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following Disclaimer as comments in the code as
* well as in the documentation and/or other materials provided with the
* distribution.
*
* . Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following Disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* . Neither the name of Agere Systems Inc. nor the names of the contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* Disclaimer
*
* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY
* USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN
* RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
* DAMAGE.
*
*/
#ifndef __ET131X_VERSION_H__
#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"
#define DRIVER_VERSION_STRING "1.2.3-lk"
#define DRIVER_VENDOR "Agere Systems, http://www.agere.com"
#define DRIVER_DESC "10/100/1000 Base-T Ethernet Driver"
#define DRIVER_INFO DRIVER_DESC " for the "\
DRIVER_DEVICE_STRING ", v" \
DRIVER_VERSION_STRING " by " \
DRIVER_VENDOR
#endif /* __ET131X_VERSION_H__ */