Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus

[linux-2.6] / include / linux / i2o-dev.h

diff --git a/include/linux/i2o-dev.h b/include/linux/i2o-dev.h
index d4a08d29e36d2f0ff776777e7733414987f216ca..36fd18cdad2897f6f0f3ff38ad4770db29227c13 100644 (file)
--- a/include/linux/i2o-dev.h
+++ b/include/linux/i2o-dev.h
@@ -32,18 +32,6 @@ typedef unsigned int u32;
 
 #endif                         /* __KERNEL__ */
 
-/*
- *     Software module types
- */
-#define I2O_SOFTWARE_MODULE_IRTOS              0x11
-#define I2O_SOFTWARE_MODULE_IOP_PRIVATE                0x22
-#define I2O_SOFTWARE_MODULE_IOP_CONFIG         0x23
-
-/*
- *     Vendors
- */
-#define I2O_VENDOR_DPT                         0x001b
-
 /*
  * I2O Control IOCTLs and structures
  */
@@ -414,6 +402,17 @@ typedef struct _i2o_status_block {
 #define ADAPTER_STATE_FAILED                   0x10
 #define ADAPTER_STATE_FAULTED                  0x11
 
+/*
+ *     Software module types
+ */
+#define I2O_SOFTWARE_MODULE_IRTOS              0x11
+#define I2O_SOFTWARE_MODULE_IOP_PRIVATE                0x22
+#define I2O_SOFTWARE_MODULE_IOP_CONFIG         0x23
+
+/*
+ *     Vendors
+ */
+#define I2O_VENDOR_DPT                         0x001b
 
 /*
  * DPT / Adaptec specific values for i2o_sg_io_hdr flags.