aboutsummaryrefslogtreecommitdiffstats
path: root/include/scsi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-19 16:32:28 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-19 16:32:28 -0500
commit5fc77247f7db01b6377a5ea6ab18c8ac60021045 (patch)
treed9f33f0e01b64a46ade3f45a3553b1a8ba8fc5b5 /include/scsi
parentd43a338e395371733a80ec473b40baac5f74d768 (diff)
parent7c9d6f16f50d3aeb780e4f103a1ba8b35d9ae803 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: [SCSI] SCSI core: better initialization for sdev->scsi_level [SCSI] scsi_proc.c: display sdev->scsi_level correctly [SCSI] megaraid_sas: update version and author info [SCSI] megaraid_sas: return sync cache call with success [SCSI] megaraid_sas: replace pci_alloc_consitent with dma_alloc_coherent in ioctl path [SCSI] megaraid_sas: add bios_param in scsi_host_template [SCSI] megaraid_sas: do not process cmds if hw_crit_error is set [SCSI] scsi_transport.h should include scsi_device.h [SCSI] aic79xx: remove extra newline from info message [SCSI] scsi_scan.c: handle bad inquiry responses [SCSI] aic94xx: tie driver to the major number of the sequencer firmware [SCSI] lpfc: add PCI error recovery support [SCSI] megaraid: pci_module_init to pci_register_driver [SCSI] tgt: fix the user/kernel ring buffer interface [SCSI] sgiwd93: interfacing to wd33c93 [SCSI] wd33c93: Fast SCSI with WD33C93B
Diffstat (limited to 'include/scsi')
-rw-r--r--include/scsi/scsi_tgt_if.h3
-rw-r--r--include/scsi/scsi_transport.h1
2 files changed, 1 insertions, 3 deletions
diff --git a/include/scsi/scsi_tgt_if.h b/include/scsi/scsi_tgt_if.h
index 46d5e70d7215..07d6e77ae895 100644
--- a/include/scsi/scsi_tgt_if.h
+++ b/include/scsi/scsi_tgt_if.h
@@ -83,8 +83,5 @@ struct tgt_event {
83} __attribute__ ((aligned (sizeof(uint64_t)))); 83} __attribute__ ((aligned (sizeof(uint64_t))));
84 84
85#define TGT_RING_SIZE (1UL << 16) 85#define TGT_RING_SIZE (1UL << 16)
86#define TGT_RING_PAGES (TGT_RING_SIZE >> PAGE_SHIFT)
87#define TGT_EVENT_PER_PAGE (PAGE_SIZE / sizeof(struct tgt_event))
88#define TGT_MAX_EVENTS (TGT_EVENT_PER_PAGE * TGT_RING_PAGES)
89 86
90#endif 87#endif
diff --git a/include/scsi/scsi_transport.h b/include/scsi/scsi_transport.h
index cca1d4926d2a..3c18baa65a72 100644
--- a/include/scsi/scsi_transport.h
+++ b/include/scsi/scsi_transport.h
@@ -22,6 +22,7 @@
22 22
23#include <linux/transport_class.h> 23#include <linux/transport_class.h>
24#include <scsi/scsi_host.h> 24#include <scsi/scsi_host.h>
25#include <scsi/scsi_device.h>
25 26
26struct scsi_transport_template { 27struct scsi_transport_template {
27 /* the attribute containers */ 28 /* the attribute containers */