diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-24 04:22:21 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-24 04:22:21 -0400 |
| commit | 66643de455c27973ac31ad6de9f859d399916842 (patch) | |
| tree | 7ebed7f051879007d4b11d6aaa9e65a1bcb0b08f /drivers/scsi/lpfc/lpfc_disc.h | |
| parent | 2c23d62abb820e19c54012520f08a198c2233a85 (diff) | |
| parent | 387e2b0439026aa738a9edca15a57e5c0bcb4dfc (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-powerpc/unistd.h
include/asm-sparc/unistd.h
include/asm-sparc64/unistd.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_disc.h')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_disc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/lpfc/lpfc_disc.h b/drivers/scsi/lpfc/lpfc_disc.h index 8932b1be2b60..41cf5d3ea6ce 100644 --- a/drivers/scsi/lpfc/lpfc_disc.h +++ b/drivers/scsi/lpfc/lpfc_disc.h | |||
| @@ -113,6 +113,7 @@ struct lpfc_nodelist { | |||
| 113 | #define NLP_NPR_ADISC 0x2000000 /* Issue ADISC when dq'ed from | 113 | #define NLP_NPR_ADISC 0x2000000 /* Issue ADISC when dq'ed from |
| 114 | NPR list */ | 114 | NPR list */ |
| 115 | #define NLP_DELAY_REMOVE 0x4000000 /* Defer removal till end of DSM */ | 115 | #define NLP_DELAY_REMOVE 0x4000000 /* Defer removal till end of DSM */ |
| 116 | #define NLP_NODEV_REMOVE 0x8000000 /* Defer removal till discovery ends */ | ||
| 116 | 117 | ||
| 117 | /* Defines for list searchs */ | 118 | /* Defines for list searchs */ |
| 118 | #define NLP_SEARCH_MAPPED 0x1 /* search mapped */ | 119 | #define NLP_SEARCH_MAPPED 0x1 /* search mapped */ |