OMAP2xxx clock: fix broken cpu_mask code

[linux-2.6-omap-h63xx.git] / fs / btrfs / compat.h

diff --git a/fs/btrfs/compat.h b/fs/btrfs/compat.h
index d39a768e65ff17c598c8c7801a204fe534b7585c..7c4503ef6efdccd39d0d7ba3caf6a46d0e28a59a 100644 (file)
--- a/fs/btrfs/compat.h
+++ b/fs/btrfs/compat.h
@@ -1,25 +1,7 @@
 #ifndef _COMPAT_H_
 #define _COMPAT_H_
 
-
-/*
- * Even if AppArmor isn't enabled, it still has different prototypes.
- * Add more distro/version pairs here to declare which has AppArmor applied.
- */
-#if defined(CONFIG_SUSE_KERNEL)
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
-# define REMOVE_SUID_PATH 1
-# endif
-#endif
-
-/*
- * catch any other distros that have patched in apparmor.  This isn't
- * 100% reliable because it won't catch people that hand compile their
- * own distro kernels without apparmor compiled in.  But, it is better
- * than nothing.
- */
-#ifdef CONFIG_SECURITY_APPARMOR
-# define REMOVE_SUID_PATH 1
-#endif
+#define btrfs_drop_nlink(inode) drop_nlink(inode)
+#define btrfs_inc_nlink(inode) inc_nlink(inode)
 
 #endif /* _COMPAT_H_ */