Merge master.kernel.org:/home/rmk/linux-2.6-arm

[sfrench/cifs-2.6.git] / security / smack / smack.h

diff --git a/security/smack/smack.h b/security/smack/smack.h
index a21a0e907ab34092017e6a67243a1ad93b3be171..62c1e982849d9b1ab83c38c1bc6bc9df68749e77 100644 (file)
--- a/security/smack/smack.h
+++ b/security/smack/smack.h
@@ -26,14 +26,6 @@
 #define SMK_MAXLEN     23
 #define SMK_LABELLEN   (SMK_MAXLEN+1)
 
-/*
- * How many kinds of access are there?
- * Here's your answer.
- */
-#define SMK_ACCESSDASH '-'
-#define SMK_ACCESSLOW  "rwxa"
-#define SMK_ACCESSKINDS        (sizeof(SMK_ACCESSLOW) - 1)
-
 struct superblock_smack {
        char            *smk_root;
        char            *smk_floor;