Merge branch 'next/board' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux...

[firefly-linux-kernel-4.4.55.git] / include / linux / quota.h

diff --git a/include/linux/quota.h b/include/linux/quota.h
index 9a85412e0db6a4015388bc4ebb2c5466e6b55db0..cb785569903759e054141b09e62e4a2c0442425f 100644 (file)
--- a/include/linux/quota.h
+++ b/include/linux/quota.h
@@ -180,7 +180,7 @@ enum {
 #include <linux/dqblk_v1.h>
 #include <linux/dqblk_v2.h>
 
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 
 typedef __kernel_uid32_t qid_t; /* Type in which we store ids in memory */
 typedef long long qsize_t;     /* Type in which we store sizes */
@@ -415,13 +415,5 @@ struct quota_module_name {
        {QFMT_VFS_V0, "quota_v2"},\
        {0, NULL}}
 
-#else
-
-# /* nodep */ include <sys/cdefs.h>
-
-__BEGIN_DECLS
-long quotactl __P ((unsigned int, const char *, int, caddr_t));
-__END_DECLS
-
 #endif /* __KERNEL__ */
 #endif /* _QUOTA_ */