diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-17 14:52:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-17 14:53:10 -0400 |
| commit | 45bd00d31de886f8425b4dd33204b911b0a466a9 (patch) | |
| tree | 06204f2452e02ca916666173d50f5035d69065ef /include/scsi/fc/fc_gs.h | |
| parent | 40d9d82c8ab8c4e2373a23a1e31dc8d84c53aa01 (diff) | |
| parent | ab86e5765d41a5eb4239a1c04d613db87bea5ed8 (diff) | |
Merge branch 'linus' into tracing/core
Merge reason: Pick up kernel/softirq.c update for dependent fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/scsi/fc/fc_gs.h')
| -rw-r--r-- | include/scsi/fc/fc_gs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/scsi/fc/fc_gs.h b/include/scsi/fc/fc_gs.h index ffab0272c65a..324dd0e3c622 100644 --- a/include/scsi/fc/fc_gs.h +++ b/include/scsi/fc/fc_gs.h | |||
| @@ -87,6 +87,7 @@ enum fc_ct_explan { | |||
| 87 | FC_FS_EXP_PNAM = 0x02, /* port name not registered */ | 87 | FC_FS_EXP_PNAM = 0x02, /* port name not registered */ |
| 88 | FC_FS_EXP_NNAM = 0x03, /* node name not registered */ | 88 | FC_FS_EXP_NNAM = 0x03, /* node name not registered */ |
| 89 | FC_FS_EXP_COS = 0x04, /* class of service not registered */ | 89 | FC_FS_EXP_COS = 0x04, /* class of service not registered */ |
| 90 | FC_FS_EXP_FTNR = 0x07, /* FC-4 types not registered */ | ||
| 90 | /* definitions not complete */ | 91 | /* definitions not complete */ |
| 91 | }; | 92 | }; |
| 92 | 93 | ||