Merge branch 'linus'

[linux-drm-fsl-dcu.git] / include / asm-alpha / io.h

diff --git a/include/asm-alpha/io.h b/include/asm-alpha/io.h
index 3ebbeee753e9c80e8410933087f08d45915e6e3d..24bdcc8b63aa2c3eebd49cdf28e48ad2b2ac0ccd 100644 (file)
--- a/include/asm-alpha/io.h
+++ b/include/asm-alpha/io.h
@@ -3,7 +3,6 @@
 
 #ifdef __KERNEL__
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <asm/compiler.h>
 #include <asm/system.h>
@@ -525,28 +524,6 @@ extern void outsb (unsigned long port, const void *src, unsigned long count);
 extern void outsw (unsigned long port, const void *src, unsigned long count);
 extern void outsl (unsigned long port, const void *src, unsigned long count);
 
-/*
- * XXX - We don't have csum_partial_copy_fromio() yet, so we cheat here and 
- * just copy it. The net code will then do the checksum later. Presently 
- * only used by some shared memory 8390 Ethernet cards anyway.
- */
-
-#define eth_io_copy_and_sum(skb,src,len,unused) \
-  memcpy_fromio((skb)->data,src,len)
-
-static inline int
-check_signature(const volatile void __iomem *io_addr,
-               const unsigned char *signature, int length)
-{
-       do {
-               if (readb(io_addr) != *signature)
-                       return 0;
-               io_addr++;
-               signature++;
-       } while (--length);
-       return 1;
-}
-
 /*
  * The Alpha Jensen hardware for some rather strange reason puts
  * the RTC clock at 0x170 instead of 0x70. Probably due to some