davinci: mmc: pass number of SG segments as platform data

[safe/jmp/linux-2.6] / net / dccp / feat.h

diff --git a/net/dccp/feat.h b/net/dccp/feat.h
index 2217066..f967216 100644 (file)
--- a/net/dccp/feat.h
+++ b/net/dccp/feat.h
@@ -57,9 +57,9 @@ typedef union {
 
 /**
  * struct feat_entry  -  Data structure to perform feature negotiation
- * @feat_num: one of %dccp_feature_numbers
  * @val: feature's current value (SP features may have preference list)
  * @state: feature's current state
+ * @feat_num: one of %dccp_feature_numbers
  * @needs_mandatory: whether Mandatory options should be sent
  * @needs_confirm: whether to send a Confirm instead of a Change
  * @empty_confirm: whether to send an empty Confirm (depends on @needs_confirm)
@@ -67,13 +67,14 @@ typedef union {
  * @node: list pointers, entries arranged in FIFO order
  */
 struct dccp_feat_entry {
-       u8                      feat_num;
        dccp_feat_val           val;
        enum dccp_feat_state    state:8;
-       bool                    needs_mandatory:1,
-                               needs_confirm:1,
-                               empty_confirm:1,
-                               is_local:1;
+       u8                      feat_num;
+
+       bool                    needs_mandatory,
+                               needs_confirm,
+                               empty_confirm,
+                               is_local;
 
        struct list_head        node;
 };