diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-09-24 22:05:59 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-09-24 22:05:59 +0100 |
| commit | 02b25fcff676125a88169c8a78d4c6dd647574ed (patch) | |
| tree | 372fc8e885be41ba1819b2767c8889ecd97ff948 /net/sunrpc/timer.c | |
| parent | 1694176a210189312e31b083bac1e1688981219a (diff) | |
| parent | a68aa1cc6f3203b8a332683ebde67a00f39eec43 (diff) | |
| download | kernel_samsung_aries-02b25fcff676125a88169c8a78d4c6dd647574ed.zip kernel_samsung_aries-02b25fcff676125a88169c8a78d4c6dd647574ed.tar.gz kernel_samsung_aries-02b25fcff676125a88169c8a78d4c6dd647574ed.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/sunrpc/timer.c')
| -rw-r--r-- | net/sunrpc/timer.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/sunrpc/timer.c b/net/sunrpc/timer.c index bcbdf64..8142fdb 100644 --- a/net/sunrpc/timer.c +++ b/net/sunrpc/timer.c @@ -19,8 +19,6 @@ #include <linux/unistd.h> #include <linux/sunrpc/clnt.h> -#include <linux/sunrpc/xprt.h> -#include <linux/sunrpc/timer.h> #define RPC_RTO_MAX (60*HZ) #define RPC_RTO_INIT (HZ/5) |