diff options
| author |   Jeff Garzik <jgarzik@pobox.com> | 2006-02-02 01:12:54 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-02 01:12:54 -0500 |
| commit | 18ee3610040a4c008ce08a40a5dd025241cc7e97 (patch) | |
| tree | 32a996a5123726b63c31a1522f230933fb967a32 /drivers/net/bonding/bond_main.c | |
| parent | [libata sata_mv] add 6042 support, fix 60xx/50xx EDMA configuration (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa (diff) | |
| download | linux-dev-18ee3610040a4c008ce08a40a5dd025241cc7e97.tar.xz linux-dev-18ee3610040a4c008ce08a40a5dd025241cc7e97.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 2582d98ef5c3..4ff006c37626 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -576,7 +576,7 @@ static int bond_update_speed_duplex(struct slave *slave) slave->duplex = DUPLEX_FULL; if (slave_dev->ethtool_ops) { - u32 res; + int res; if (!slave_dev->ethtool_ops->get_settings) { return -1; |