diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-04-16 15:20:06 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-04-16 15:20:06 +0200 |
| commit | cf0dbba515415bb19b11f9323d5f7bebd7f24fd6 (patch) | |
| tree | 375bbc1ade1a92acd6493d224dd701fd7f209014 /fs/nfs/proc.c | |
| parent | 1cff399ecd9125d8e6a634a1957be1aeb3195a12 (diff) | |
| parent | 0340c7dccd80d8706c636e030a6ebbddbddca690 (diff) | |
Merge remote branch 'alsa/devel' into topic/misc
Diffstat (limited to 'fs/nfs/proc.c')
| -rw-r--r-- | fs/nfs/proc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c index c752d944fe9e..0288be80444f 100644 --- a/fs/nfs/proc.c +++ b/fs/nfs/proc.c @@ -29,7 +29,6 @@ #include <linux/types.h> #include <linux/param.h> -#include <linux/slab.h> #include <linux/time.h> #include <linux/mm.h> #include <linux/errno.h> |