Merge branch 'from-linus' into upstream

[powerpc.git] / drivers / net / e1000 / Makefile

diff --git a/drivers/net/e1000/Makefile b/drivers/net/e1000/Makefile
index 92823ac..5dea2b7 100644 (file)
--- a/drivers/net/e1000/Makefile
+++ b/drivers/net/e1000/Makefile
@@ -1,7 +1,7 @@
 ################################################################################
 #
 # 
-# Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved.
+# 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