diff options
author | James Morris <jmorris@namei.org> | 2010-01-18 09:56:22 +1100 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2010-01-18 09:56:22 +1100 |
commit | 2457552d1e6f3183cd93f81c49a8da5fe8bb0e42 (patch) | |
tree | 7ca46caa910012d75617700e4083b3657053cb31 /include/linux/sunrpc/debug.h | |
parent | 19439d05b88dafc4e55d9ffce84ccc27cf8b2bcc (diff) | |
parent | 6ccf80eb15ccaca4d3f1ab5162b9ded5eecd9971 (diff) | |
download | op-kernel-dev-2457552d1e6f3183cd93f81c49a8da5fe8bb0e42.zip op-kernel-dev-2457552d1e6f3183cd93f81c49a8da5fe8bb0e42.tar.gz |
Merge branch 'master' into next
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 10709cbe..c2786f2 100644 --- a/include/linux/sunrpc/debug.h +++ b/include/linux/sunrpc/debug.h @@ -28,9 +28,6 @@ #ifdef __KERNEL__ -#include <linux/timer.h> -#include <linux/workqueue.h> - /* * Enable RPC debugging/profiling. */ |