diff -Naur linux-2.6.30.4-orig/drivers/net/comcerto/comcerto_smi_part.h linux-2.6.30.4-new/drivers/net/comcerto/comcerto_smi_part.h
--- linux-2.6.30.4-orig/drivers/net/comcerto/comcerto_smi_part.h	2009-11-03 12:50:38.528956000 -0800
+++ linux-2.6.30.4-new/drivers/net/comcerto/comcerto_smi_part.h	2009-11-03 13:01:32.534488000 -0800
@@ -22,13 +22,13 @@
 #define __COMCERTO_SMI_PART_H
 
 struct FASTPART {
+	volatile u8 lock;
+	u8 reserved1;
 	volatile unsigned long freeblk;
 	unsigned long storage;
 	u32 blksz;
 	u32 blkcnt;
 	u32 *end_of_storage;
-	volatile u8 lock;
-	u8 reserved1;
 	u16 reserved2;
 	u32 freecnt;
 };
diff -Naur linux-2.6.30.4-orig/drivers/net/comcerto/comcerto_smi_queue.h linux-2.6.30.4-new/drivers/net/comcerto/comcerto_smi_queue.h
--- linux-2.6.30.4-orig/drivers/net/comcerto/comcerto_smi_queue.h	2009-11-03 12:50:38.537958000 -0800
+++ linux-2.6.30.4-new/drivers/net/comcerto/comcerto_smi_queue.h	2009-11-03 13:01:32.538487000 -0800
@@ -32,10 +32,10 @@
 struct FASTQUEUE {
 	unsigned long storage;
 	u32 sema;
+	u16 lock;
 	volatile u16 get;
 	volatile u16 put;
 	u16 size;
-	u16 lock;
 };
 
 /* private structure (CSP only) */
