diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 09:06:09 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 09:06:09 -0400 |
| commit | e66d90fb4abd0a27ee96f57a32fb561221c4d6ae (patch) | |
| tree | 3337cba94c7444b06fdb0e8b487287d07b71f4a0 /drivers/net/tulip/eeprom.c | |
| parent | 55ca089e2579de90f048aca2a3030b8b2f864813 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge branch 'linus' into xen-64bit
Diffstat (limited to 'drivers/net/tulip/eeprom.c')
| -rw-r--r-- | drivers/net/tulip/eeprom.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/tulip/eeprom.c b/drivers/net/tulip/eeprom.c index da2206f6021d..0dcced1263b9 100644 --- a/drivers/net/tulip/eeprom.c +++ b/drivers/net/tulip/eeprom.c | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | drivers/net/tulip/eeprom.c | 2 | drivers/net/tulip/eeprom.c |
| 3 | 3 | ||
| 4 | Maintained by Valerie Henson <val_henson@linux.intel.com> | ||
| 5 | Copyright 2000,2001 The Linux Kernel Team | 4 | Copyright 2000,2001 The Linux Kernel Team |
| 6 | Written/copyright 1994-2001 by Donald Becker. | 5 | Written/copyright 1994-2001 by Donald Becker. |
| 7 | 6 | ||
| @@ -9,9 +8,8 @@ | |||
| 9 | of the GNU General Public License, incorporated herein by reference. | 8 | of the GNU General Public License, incorporated herein by reference. |
| 10 | 9 | ||
| 11 | Please refer to Documentation/DocBook/tulip-user.{pdf,ps,html} | 10 | Please refer to Documentation/DocBook/tulip-user.{pdf,ps,html} |
| 12 | for more information on this driver, or visit the project | 11 | for more information on this driver. |
| 13 | Web page at http://sourceforge.net/projects/tulip/ | 12 | Please submit bug reports to http://bugzilla.kernel.org/. |
| 14 | |||
| 15 | */ | 13 | */ |
| 16 | 14 | ||
| 17 | #include <linux/pci.h> | 15 | #include <linux/pci.h> |
