Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

[linux-2.6.git] / include / linux / smb.h

diff --git a/include/linux/smb.h b/include/linux/smb.h
index ce10216..f098dff 100644 (file)
--- a/include/linux/smb.h
+++ b/include/linux/smb.h
@@ -10,6 +10,7 @@
 #define _LINUX_SMB_H
 
 #include <linux/types.h>
+#include <linux/magic.h>
 
 enum smb_protocol { 
        SMB_PROTOCOL_NONE, 
@@ -100,8 +101,6 @@ enum smb_conn_state {
        CONN_RETRYING           /* Currently trying to reconnect */
 };
 
-#define SMB_SUPER_MAGIC               0x517B
-
 #define SMB_HEADER_LEN   37     /* includes everything up to, but not
                                  * including smb_bcc */