diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /fs/cifs/cifs_debug.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'fs/cifs/cifs_debug.h')
| -rw-r--r-- | fs/cifs/cifs_debug.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/cifs_debug.h b/fs/cifs/cifs_debug.h index aa316891ac0c..8942b28cf807 100644 --- a/fs/cifs/cifs_debug.h +++ b/fs/cifs/cifs_debug.h | |||
| @@ -34,7 +34,7 @@ void cifs_dump_mids(struct TCP_Server_Info *); | |||
| 34 | extern int traceSMB; /* flag which enables the function below */ | 34 | extern int traceSMB; /* flag which enables the function below */ |
| 35 | void dump_smb(struct smb_hdr *, int); | 35 | void dump_smb(struct smb_hdr *, int); |
| 36 | #define CIFS_INFO 0x01 | 36 | #define CIFS_INFO 0x01 |
| 37 | #define CIFS_RC 0x02 | 37 | #define CIFS_RC 0x02 |
| 38 | #define CIFS_TIMER 0x04 | 38 | #define CIFS_TIMER 0x04 |
| 39 | 39 | ||
| 40 | /* | 40 | /* |