diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-25 13:57:03 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-25 13:57:03 -0400 |
| commit | 34812c9e188b47b1d6c9fff8ba530e6f2365ebc4 (patch) | |
| tree | 63e968991d043a30b80f7e3f99a3f6445455a704 /drivers/net/e1000/e1000_param.c | |
| parent | d6d78f63cea62851806bf6ac40c6f53349de442b (diff) | |
| parent | 2648345fcbadfae8e7113112ff9402e465a184dc (diff) | |
| download | kernel_samsung_espresso10-34812c9e188b47b1d6c9fff8ba530e6f2365ebc4.zip kernel_samsung_espresso10-34812c9e188b47b1d6c9fff8ba530e6f2365ebc4.tar.gz kernel_samsung_espresso10-34812c9e188b47b1d6c9fff8ba530e6f2365ebc4.tar.bz2 | |
Automatic merge of /spare/repo/netdev-2.6 branch e1000
Diffstat (limited to 'drivers/net/e1000/e1000_param.c')
| -rw-r--r-- | drivers/net/e1000/e1000_param.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000_param.c b/drivers/net/e1000/e1000_param.c index e914d09..676247f 100644 --- a/drivers/net/e1000/e1000_param.c +++ b/drivers/net/e1000/e1000_param.c @@ -1,7 +1,7 @@ /******************************************************************************* - Copyright(c) 1999 - 2004 Intel Corporation. All rights reserved. + Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved. 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 the Free @@ -478,7 +478,6 @@ e1000_check_options(struct e1000_adapter *adapter) DPRINTK(PROBE, INFO, "%s set to dynamic mode\n", opt.name); break; - case -1: default: e1000_validate_option(&adapter->itr, &opt, adapter); |