[POWERPC] 83xx: Add default config file for Wind River SBC8349 board

[linux-2.6] / include / scsi / scsi.h

diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index 8a3f0bd0d45adef1fde36ae143873c62a9e9bf5f..702fcfeb37f19c1d4ef5f7c03692d4e900b574cd 100644 (file)
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -10,13 +10,6 @@
 
 #include <linux/types.h>
 
-/*
- *     The maximum sg list length SCSI can cope with
- *     (currently must be a power of 2 between 32 and 256)
- */
-#define SCSI_MAX_PHYS_SEGMENTS MAX_PHYS_SEGMENTS
-
-
 /*
  *     SCSI command lengths
  */
@@ -203,6 +196,7 @@ static inline int scsi_status_is_good(int status)
 
 /*
  *  DEVICE TYPES
+ *  Please keep them in 0x%02x format for $MODALIAS to work
  */
 
 #define TYPE_DISK           0x00
@@ -433,7 +427,7 @@ struct scsi_lun {
 #define SCSI_IOCTL_GET_PCI             0x5387
 
 /* Pull a u32 out of a SCSI message (using BE SCSI conventions) */
-static inline u32 scsi_to_u32(u8 *ptr)
+static inline __u32 scsi_to_u32(__u8 *ptr)
 {
        return (ptr[0]<<24) + (ptr[1]<<16) + (ptr[2]<<8) + ptr[3];
 }