aboutsummaryrefslogtreecommitdiff
path: root/include/linux/quotaops.h
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2009-07-16 04:21:39 +0000
committerSteve French <sfrench@us.ibm.com>2009-07-16 04:21:39 +0000
commitf6c43385435640e056424034caac0d765c45e370 (patch)
tree54c2ba0a7d3abb156bc51f6b9f02e00f0a260f85 /include/linux/quotaops.h
parent65bc98b0059360e458aebd208587be44641227c1 (diff)
parent35b5c55fee08e6e4001ba98060a2d0b82f70b5f4 (diff)
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/quotaops.h')
-rw-r--r--include/linux/quotaops.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h
index 7bc45759368..26361c4c037 100644
--- a/include/linux/quotaops.h
+++ b/include/linux/quotaops.h
@@ -7,7 +7,6 @@
#ifndef _LINUX_QUOTAOPS_
#define _LINUX_QUOTAOPS_
-#include <linux/smp_lock.h>
#include <linux/fs.h>
static inline struct quota_info *sb_dqopt(struct super_block *sb)