Merge with mainline to remove plat-omap/Kconfig conflict

Conflicts:
	arch/arm/plat-omap/Kconfig

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/block/cciss_scsi.h b/drivers/block/cciss_scsi.h
index 7b750245ae76..6d5822fe851a 100644
--- 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