Update ia64 patch to 2.5.72-030619

[linux-flexiantxendom0-3.2.10.git] / arch / ia64 / sn / kernel / sn2 / io.c

diff --git a/arch/ia64/sn/kernel/sn2/io.c b/arch/ia64/sn/kernel/sn2/io.c
index 9de1276..5942370 100644 (file)
--- a/arch/ia64/sn/kernel/sn2/io.c
+++ b/arch/ia64/sn/kernel/sn2/io.c
@@ -9,13 +9,8 @@
  * we wrap the inlines from asm/ia64/sn/sn2/io.h here.
  */
 
-#include <linux/config.h>
-#include <linux/types.h>
-
 #include <asm/sn/sn2/io.h>
 
-#ifdef CONFIG_IA64_GENERIC
-
 unsigned int
 sn_inb (unsigned long port)
 {
@@ -73,7 +68,7 @@ sn_readl (void *addr)
 unsigned long
 sn_readq (void *addr)
 {
-       return __sn_readq (addr)
+       return __sn_readq (addr);
 }
 
 
@@ -94,5 +89,3 @@ asm ("__sn_readb = sn_readb");
 asm ("__sn_readw = sn_readw");
 asm ("__sn_readl = sn_readl");
 asm ("__sn_readq = sn_readq");
-
-#endif /* CONFIG_IA64_GENERIC */