Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[pandora-kernel.git] / drivers / block / cciss_scsi.h

diff --git a/drivers/block/cciss_scsi.h b/drivers/block/cciss_scsi.h
index 7b75024..6d5822f 100644 (file)
--- a/drivers/block/cciss_scsi.h
+++ b/drivers/block/cciss_scsi.h
@@ -25,16 +25,16 @@
 
 #include <scsi/scsicam.h> /* possibly irrelevant, since we don't show disks */
 
-               // the scsi id of the adapter...
+               /* the scsi id of the adapter... */
 #define SELF_SCSI_ID 15
-               // 15 is somewhat arbitrary, since the scsi-2 bus
-               // that's presented by the driver to the OS is
-               // fabricated.  The "real" scsi-3 bus the 
-               // hardware presents is fabricated too.
-               // The actual, honest-to-goodness physical
-               // bus that the devices are attached to is not 
-               // addressible natively, and may in fact turn
-               // out to be not scsi at all.
+               /* 15 is somewhat arbitrary, since the scsi-2 bus
+                  that's presented by the driver to the OS is
+                  fabricated.  The "real" scsi-3 bus the
+                  hardware presents is fabricated too.
+                  The actual, honest-to-goodness physical
+                  bus that the devices are attached to is not
+                  addressible natively, and may in fact turn
+                  out to be not scsi at all. */
 
 #define SCSI_CCISS_CAN_QUEUE 2