diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-03-01 02:55:20 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-03-01 02:55:20 -0500 |
| commit | 35858adbfca13678af99fb31618ef4428d6dedb0 (patch) | |
| tree | 3336feaa61324486945816cb52c347733e7c0821 /include/linux/sunrpc/debug.h | |
| parent | 197d4db752e67160d79fed09968c2140376a80a3 (diff) | |
| parent | 4b70858ba8d4537daf782defebe5f2ff80ccef2b (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'include/linux/sunrpc/debug.h')
| -rw-r--r-- | include/linux/sunrpc/debug.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/sunrpc/debug.h b/include/linux/sunrpc/debug.h index 10709cbe96fd..c2786f20016f 100644 --- a/include/linux/sunrpc/debug.h +++ b/include/linux/sunrpc/debug.h | |||
| @@ -28,9 +28,6 @@ | |||
| 28 | 28 | ||
| 29 | #ifdef __KERNEL__ | 29 | #ifdef __KERNEL__ |
| 30 | 30 | ||
| 31 | #include <linux/timer.h> | ||
| 32 | #include <linux/workqueue.h> | ||
| 33 | |||
| 34 | /* | 31 | /* |
| 35 | * Enable RPC debugging/profiling. | 32 | * Enable RPC debugging/profiling. |
| 36 | */ | 33 | */ |