Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[linux-2.6-omap-h63xx.git] / fs / cifs / cifsglob.h

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index 9b7762c754cbe662201a17ca9c845f6a7df071fb..87f51f23276f42f23d054679042fb92b1ace313f 100644 (file)
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -499,11 +499,13 @@ require use of the stronger protocol */
 #define   CIFSSEC_MASK          0x3F03F /* allows weak security but also krb5 */
 #else
 #define   CIFSSEC_MASK          0x37037 /* current flags supported if weak */
+#endif /* UPCALL */
 #else /* do not allow weak pw hash */
 #ifdef CONFIG_CIFS_UPCALL
 #define   CIFSSEC_MASK          0x0F00F /* flags supported if no weak allowed */
 #else
 #define          CIFSSEC_MASK          0x07007 /* flags supported if no weak allowed */
+#endif /* UPCALL */
 #endif /* WEAK_PW_HASH */
 #define   CIFSSEC_MUST_SEAL    0x40040 /* not supported yet */