refresh

diff --git a/meta b/meta
index 5ff2b8067f3c8fd95ecc16b443df9fe12a3a09ec..29ac93d5936a46c5a3a624ff8a5debfd564fc498 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 6847de89fba959092ec03a84f90724d79a763a83
-Head: 1df78128f56d8b76ac94c03c773205e3fcc49d72
+Previous: 9022a8c1b7254da93e66c386fbb0fcdb35dd1897
+Head: ffaa1d84fb9fe7c25052bfb5188dfc2dfeef1b0c
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -11,8 +11,7 @@ Applied:
   locking: 558e5577364aec3531c54b28def6e16f0c926524
   verbose: 15cf7a7a260a694923bcb5c9181b10b0f02108f7
   dbg_1: 0b650c149079cd8e1593504492a9940521fb9c6d
-  no_addr: 33b72f8f05020415262a067e2f11afff172af534
-  refresh-temp: 1df78128f56d8b76ac94c03c773205e3fcc49d72
+  no_addr: ffaa1d84fb9fe7c25052bfb5188dfc2dfeef1b0c
 Unapplied:
   acme_verbose: 45cba0846874c93ef7af156bf0afe59f43d82ea6
   1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37

diff --git a/patches/no_addr b/patches/no_addr
index 5aa5701c9d22a96580606e5e63057405cd58af57..427da0b68969d438d5955bb364d77b8ee7953b2f 100644 (file)
--- a/patches/no_addr
+++ b/patches/no_addr
@@ -1,5 +1,5 @@
 Bottom: 5e7b11ab34ad911d8a6551337d36c51be1b092b4
-Top:    731f7fad19300220b8a2942d713e13875fa93fbd
+Top:    d1f15369c5c58ddc6d2873adb997c555d4f4229a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-06 11:06:47 -0800
 
@@ -17,7 +17,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index 9ff81c4..cfb60a4 100644
+index 9ff81c4..1391c70 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -203,6 +203,7 @@ static SOCKET listen_socket;
@@ -78,7 +78,7 @@ index 9ff81c4..cfb60a4 100644
  
 +      if ((faddr = acm_open_addr_file())) {
 +              acm_log(0, "ERROR - address file not found\n");
-+              return -1
++              return -1;
 +      }
 +
        umad_init();

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 9749330..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 731f7fad19300220b8a2942d713e13875fa93fbd
-Top:    d1f15369c5c58ddc6d2873adb997c555d4f4229a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-06 11:32:58 -0800
-
-Refresh of no_addr
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index cfb60a4..1391c70 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -2827,7 +2827,7 @@ int CDECL_FUNC main(int argc, char **argv)
- 
-       if ((faddr = acm_open_addr_file())) {
-               acm_log(0, "ERROR - address file not found\n");
--              return -1
-+              return -1;
-       }
- 
-       umad_init();