Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 259584
b: refs/heads/master
c: 76fb419
h: refs/heads/master
v: v3
  • Loading branch information
Mark Einon authored and Greg Kroah-Hartman committed Jun 28, 2011
1 parent 9d85a6b commit 5adbcc8
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 15 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: 47883130a049be2d55c3a8080a71e73d4b939ef8
refs/heads/master: 76fb419e030f8cf43520eb50c0e86e10929d0370
29 changes: 15 additions & 14 deletions trunk/drivers/staging/et131x/et131x_initpci.c
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,13 @@
static u32 et131x_speed_set;
module_param(et131x_speed_set, uint, 0);
MODULE_PARM_DESC(et131x_speed_set,
"Set Link speed and dublex manually (0-5) [0]\n \
1 : 10Mb Half-Duplex\n \
2 : 10Mb Full-Duplex\n \
3 : 100Mb Half-Duplex\n \
4 : 100Mb Full-Duplex\n \
5 : 1000Mb Full-Duplex\n \
0 : Auto Speed Auto Dublex");
"Set Link speed and dublex manually (0-5) [0]\n"
"1 : 10Mb Half-Duplex\n"
"2 : 10Mb Full-Duplex\n"
"3 : 100Mb Half-Duplex\n"
"4 : 100Mb Full-Duplex\n"
"5 : 1000Mb Full-Duplex\n"
"0 : Auto Speed Auto Dublex");

/**
* et131x_hwaddr_init - set up the MAC Address on the ET1310
Expand Down Expand Up @@ -539,7 +539,8 @@ static struct et131x_adapter *et131x_adapter_init(struct net_device *netdev,

struct et131x_adapter *etdev;

/* Setup the fundamental net_device and private adapter structure elements */
/* Setup the fundamental net_device and private adapter structure
* elements */
SET_NETDEV_DEV(netdev, &pdev->dev);

/* Allocate private adapter struct and copy in relevant information */
Expand Down Expand Up @@ -807,12 +808,12 @@ static struct pci_device_id et131x_pci_table[] __devinitdata = {
MODULE_DEVICE_TABLE(pci, et131x_pci_table);

static struct pci_driver et131x_driver = {
.name = DRIVER_NAME,
.id_table = et131x_pci_table,
.probe = et131x_pci_setup,
.remove = __devexit_p(et131x_pci_remove),
.suspend = NULL, /* et131x_pci_suspend */
.resume = NULL, /* et131x_pci_resume */
.name = DRIVER_NAME,
.id_table = et131x_pci_table,
.probe = et131x_pci_setup,
.remove = __devexit_p(et131x_pci_remove),
.suspend = NULL, /* et131x_pci_suspend */
.resume = NULL, /* et131x_pci_resume */
};


Expand Down

0 comments on commit 5adbcc8

Please sign in to comment.