diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2010-01-08 03:11:18 -0500 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2010-01-08 03:11:18 -0500 |
| commit | a4ad68d57e4dc4138304df23d1817eb094149389 (patch) | |
| tree | ca7d8c4ce5377c4251560de06e15dd7be7063351 /fs/lockd/svcproc.c | |
| parent | cd9d95a55550555da8e587ead9cbba5f98a371a3 (diff) | |
| parent | c97259df3f2e163c72f4d0685c61fb2e026dc989 (diff) | |
Merge branch 'topic/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into devel
Diffstat (limited to 'fs/lockd/svcproc.c')
| -rw-r--r-- | fs/lockd/svcproc.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c index e1d28ddd2169..56c9519d900a 100644 --- a/fs/lockd/svcproc.c +++ b/fs/lockd/svcproc.c | |||
| @@ -11,10 +11,6 @@ | |||
| 11 | #include <linux/time.h> | 11 | #include <linux/time.h> |
| 12 | #include <linux/slab.h> | 12 | #include <linux/slab.h> |
| 13 | #include <linux/smp_lock.h> | 13 | #include <linux/smp_lock.h> |
| 14 | #include <linux/in.h> | ||
| 15 | #include <linux/sunrpc/svc.h> | ||
| 16 | #include <linux/sunrpc/clnt.h> | ||
| 17 | #include <linux/nfsd/nfsd.h> | ||
| 18 | #include <linux/lockd/lockd.h> | 14 | #include <linux/lockd/lockd.h> |
| 19 | #include <linux/lockd/share.h> | 15 | #include <linux/lockd/share.h> |
| 20 | 16 | ||