cleaning up after merge

[linux-2.6.git] / drivers / s390 / sysinfo.c

diff --git a/drivers/s390/sysinfo.c b/drivers/s390/sysinfo.c
index 87c2db1..d1c1e75 100644 (file)
--- a/drivers/s390/sysinfo.c
+++ b/drivers/s390/sysinfo.c
@@ -5,7 +5,6 @@
  *    Author(s): Ulrich Weigand (Ulrich.Weigand@de.ibm.com)
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/proc_fs.h>
@@ -106,7 +105,7 @@ static inline int stsi (void *sysinfo,
 {
        int cc, retv;
 
-#ifndef CONFIG_ARCH_S390X
+#ifndef CONFIG_64BIT
        __asm__ __volatile__ (  "lr\t0,%2\n"
                                "\tlr\t1,%3\n"
                                "\tstsi\t0(%4)\n"