commit b7020c1a2fc6f55fd54fd87711bc5ddd52bdfcfb
author Kenny Root <kroot@google.com> Wed Oct 17 10:10:28 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 17 10:10:28 2012 -0700
tree 18a2652ce2e48c1acef618018db31b75f79c172e
parent 835f5cb7e5d60a541c40454bb76e1900d8cdfb8b
parent 4ff85ad26acab3f4bbab6195c5e092999164f7d8

am 4ff85ad2: am 50d42703: Merge "Remove HAVE_SELINUX guards"

* commit '4ff85ad26acab3f4bbab6195c5e092999164f7d8':
  Remove HAVE_SELINUX guards

ext4_utils/contents.c

diff --git a/ext4_utils/contents.c b/ext4_utils/contents.c
index 345ab1e..8d20eb2 100644
--- a/ext4_utils/contents.c
+++ b/ext4_utils/contents.c
@@ -250,7 +250,6 @@
 	return 0;
 }
 
-#ifdef HAVE_SELINUX
 #define XATTR_SELINUX_SUFFIX "selinux"
 
 /* XXX */
@@ -292,9 +291,3 @@
 
 	return 0;
 }
-#else
-int inode_set_selinux(u32 inode_num, const char *secon)
-{
-	return 0;
-}
-#endif