refresh

diff --git a/meta b/meta
index 0398e448f17015f72967e93652099a7237405109..796227d23c2ba37d73cc1b2b3f28946262a8995b 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: b694ad19c603adf4673f29f73a2286252fcac29c
-Head: 858c281024d9e264a11e10b647521e12a28eb511
+Previous: 3f605914b0fe635e5a6395655ef0aa1526f46aa6
+Head: 5fb48c1b8d722b60332f83ca4c8b92b2a7e456a6
 Applied:
   deam: 15fcbd5198ba0c15ab4e8fddcdba32c8ef45faf8
-  braces: 4d4d004df821b55ca6629082f458a600f5db7db9
-  refresh-temp: 858c281024d9e264a11e10b647521e12a28eb511
+  braces: 5fb48c1b8d722b60332f83ca4c8b92b2a7e456a6
 Unapplied:
   counters: 2dfd53bab4aa19e9ff81cea1b95a9fcf2eee4f19
   acm1.0.5: 1b225173756cfcec4d81d26b1160ebae7644261b

diff --git a/patches/braces b/patches/braces
index 89579966719cfb36f2690d1ee5283fa94e29cc29..ea4d05709be1f1f7fdde522d23a4ae7efcd07843 100644 (file)
--- a/patches/braces
+++ b/patches/braces
@@ -1,5 +1,5 @@
 Bottom: 3f0cd7ed6f329afff1dfddf4cff25880f32dd99e
-Top:    143fb07ac2b47bf2113d0007e4405b579e8a6897
+Top:    fad6610d1d2786b12bafb5cd923f53cfb674ebdb
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-06-27 12:08:16 -0700
 
@@ -60,6 +60,20 @@ index 41b95b8..143d512 100644
        struct acm_hdr          hdr;
        uint8_t                 data[ACM_MSG_DATA_LENGTH];
  };
+diff --git a/linux/dlist.h b/linux/dlist.h
+index dc4934d..d08f843 100644
+--- a/linux/dlist.h
++++ b/linux/dlist.h
+@@ -34,8 +34,7 @@
+ extern "C" {\r
+ #endif\r
+ \r
+-typedef struct _DLIST_ENTRY\r
+-{\r
++typedef struct _DLIST_ENTRY {\r
+       struct _DLIST_ENTRY     *Next;\r
+       struct _DLIST_ENTRY     *Prev;\r
+ \r
 diff --git a/src/acm.c b/src/acm.c
 index 2afb8f2..8b01adb 100644
 --- a/src/acm.c

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index cb9fa50..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 143fb07ac2b47bf2113d0007e4405b579e8a6897
-Top:    fad6610d1d2786b12bafb5cd923f53cfb674ebdb
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-06-27 12:13:31 -0700
-
-Refresh of braces
-
----
-
-diff --git a/linux/dlist.h b/linux/dlist.h
-index dc4934d..d08f843 100644
---- a/linux/dlist.h
-+++ b/linux/dlist.h
-@@ -34,8 +34,7 @@
- extern "C" {\r
- #endif\r
- \r
--typedef struct _DLIST_ENTRY\r
--{\r
-+typedef struct _DLIST_ENTRY {\r
-       struct _DLIST_ENTRY     *Next;\r
-       struct _DLIST_ENTRY     *Prev;