Merge branch 'master' of /home/git/u-boot

[oweals/u-boot.git] / include / asm-blackfin / string.h

diff --git a/include/asm-blackfin/string.h b/include/asm-blackfin/string.h
index 83d931e192186b07ef9bfc58c2e834f726610ece..18306dd54c99c9cc1fb4b6b0730005a68f51dd03 100644 (file)
--- a/include/asm-blackfin/string.h
+++ b/include/asm-blackfin/string.h
@@ -1,7 +1,7 @@
 /*
  * U-boot - string.h String functions
  *
- * Copyright (c) 2005 blackfin.uclinux.org
+ * Copyright (c) 2005-2007 Analog Devices Inc.
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -18,8 +18,8 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
  */
 
 /* Changed by Lineo Inc. May 2001 */
@@ -29,7 +29,6 @@
 
 #ifdef __KERNEL__              /* only set these up for kernel code */
 
-#include <asm/setup.h>
 #include <config.h>
 #include <asm/blackfin.h>