From 36cc1226a327a1df1189d97a11e09b4e9223021e Mon Sep 17 00:00:00 2001
From: Boaz Harrosh <bharrosh@panasas.com>
Date: Mon, 7 Dec 2009 12:52:16 +0100
Subject: [PATCH] --- yaml --- r: 173287 b: refs/heads/master c:
 2da3cf9755ea992a18650860fde74e3bfa8c8b65 h: refs/heads/master i:   173285:
 d45083b366742dbe03799e21b04e8a49a149f41b   173283:
 74c08a23d04077a0efe408b39f11b646e83cda44   173279:
 11595bde8455c591013aa85f602cbe9fe0beb745 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/s390/kernel/compat_linux.c | 6 ------
 trunk/arch/s390/kernel/compat_linux.h | 4 ----
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 283e38a3fc58..767dcf894867 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0694685bc892c60009335e61af1f058f06ccf64
+refs/heads/master: 2da3cf9755ea992a18650860fde74e3bfa8c8b65
diff --git a/trunk/arch/s390/kernel/compat_linux.c b/trunk/arch/s390/kernel/compat_linux.c
index 0debcec23a39..29a2f34b9555 100644
--- a/trunk/arch/s390/kernel/compat_linux.c
+++ b/trunk/arch/s390/kernel/compat_linux.c
@@ -31,14 +31,8 @@
 #include <linux/shm.h>
 #include <linux/slab.h>
 #include <linux/uio.h>
-#include <linux/nfs_fs.h>
 #include <linux/quota.h>
 #include <linux/module.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/cache.h>
-#include <linux/nfsd/xdr.h>
-#include <linux/nfsd/syscall.h>
 #include <linux/poll.h>
 #include <linux/personality.h>
 #include <linux/stat.h>
diff --git a/trunk/arch/s390/kernel/compat_linux.h b/trunk/arch/s390/kernel/compat_linux.h
index c07f9ca05ade..81d6ee826ff3 100644
--- a/trunk/arch/s390/kernel/compat_linux.h
+++ b/trunk/arch/s390/kernel/compat_linux.h
@@ -4,10 +4,6 @@
 #include <linux/compat.h>
 #include <linux/socket.h>
 #include <linux/syscalls.h>
-#include <linux/nfs_fs.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/export.h>
 
 /* Macro that masks the high order bit of an 32 bit pointer and converts it*/
 /*       to a 64 bit pointer */