patch-2.1.132 linux/include/asm-m68k/string.h

• Lines: 27
• Date: Thu Dec 17 09:06:25 1998
• Orig file: v2.1.131/linux/include/asm-m68k/string.h
• Orig date: Fri Dec 20 01:20:03 1996

diff -u --recursive --new-file v2.1.131/linux/include/asm-m68k/string.h linux/include/asm-m68k/string.h
@@ -1,7 +1,7 @@
 #ifndef _M68K_STRING_H_
 #define _M68K_STRING_H_
 
-#include <linux/config.h>
+#include <asm/setup.h>
 #include <asm/page.h>
 
 #define __HAVE_ARCH_STRCPY
@@ -315,7 +315,7 @@
   data = c | (c << 8);
   data |= data << 16;
 
-#if defined(CONFIG_OPTIMIZE_040) || defined(CONFIG_OPTIMIZE_060)
+#ifdef CPU_M68040_OR_M68060_ONLY
 
   if (((unsigned long) s) & 0x0f)
 	  memset(s, c, count);
@@ -386,7 +386,7 @@
   unsigned long tmp;
   void *xto = to;
 
-#if defined(CONFIG_OPTIMIZE_040) || defined(CONFIG_OPTIMIZE_060)
+#ifdef CPU_M68040_OR_M68060_ONLY
 
   if (((unsigned long) to | (unsigned long) from) & 0x0f)
 	  return memcpy(to, from, count);