diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-28 00:01:53 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-28 00:01:53 +0200 |
| commit | 022e7a12b6aa11a11de4d708fe8606c9a6734b37 (patch) | |
| tree | f4b94bbbe7f585eddcbf06c4bb92903b71a1840f /drivers/net/e1000/Makefile | |
| parent | [PATCH] spidernet: Use pci_dma_mapping_error() (diff) | |
| parent | e100, e1000, ixgb: increment version numbers (diff) | |
| download | linux-022e7a12b6aa11a11de4d708fe8606c9a6734b37.tar.xz linux-022e7a12b6aa11a11de4d708fe8606c9a6734b37.zip | |
Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into tmp
Diffstat (limited to 'drivers/net/e1000/Makefile')
| -rw-r--r-- | drivers/net/e1000/Makefile | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/drivers/net/e1000/Makefile b/drivers/net/e1000/Makefile index 5dea2b7dea4d..4a6ab1522451 100644 --- a/drivers/net/e1000/Makefile +++ b/drivers/net/e1000/Makefile @@ -1,25 +1,24 @@ ################################################################################ # -# -# Copyright(c) 1999 - 2006 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 -# Software Foundation; either version 2 of the License, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# Intel PRO/1000 Linux driver +# Copyright(c) 1999 - 2006 Intel Corporation. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms and conditions of the GNU General Public License, +# version 2, as published by the Free Software Foundation. +# +# This program is distributed in the hope it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # more details. -# +# # 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. -# -# The full GNU General Public License is included in this distribution in the -# file called LICENSE. -# +# this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. +# +# The full GNU General Public License is included in this distribution in +# the file called "COPYING". +# # Contact Information: # Linux NICS <linux.nics@intel.com> # e1000-devel Mailing List <e1000-devel@lists.sourceforge.net> |