r8169: revert "read MAC address from EEPROM on init"

[linux-2.6-omap-h63xx.git] / include / asm-m68k / uaccess.h

diff --git a/include/asm-m68k/uaccess.h b/include/asm-m68k/uaccess.h
index 6a4cf20815126a4f83ef42831d62beae1f1e7719..7107f3fbdbb66885bd000ec206648b5013bbcaf9 100644 (file)
--- a/include/asm-m68k/uaccess.h
+++ b/include/asm-m68k/uaccess.h
@@ -14,7 +14,11 @@
 #define VERIFY_WRITE   1
 
 /* We let the MMU do all checking */
-#define access_ok(type,addr,size) 1
+static inline int access_ok(int type, const void __user *addr,
+                           unsigned long size)
+{
+       return 1;
+}
 
 /*
  * The exception table consists of pairs of addresses: the first is the
@@ -361,7 +365,9 @@ __constant_copy_to_user(void __user *to, const void *from, unsigned long n)
 
 long strncpy_from_user(char *dst, const char __user *src, long count);
 long strnlen_user(const char __user *src, long n);
-unsigned long clear_user(void __user *to, unsigned long n);
+unsigned long __clear_user(void __user *to, unsigned long n);
+
+#define clear_user     __clear_user
 
 #define strlen_user(str) strnlen_user(str, 32767)