# HG changeset patch # User Florian Pose # Date 1232970398 0 # Node ID 379e60baa5be2e19a801dce34e08a718b2cc999f # Parent 00c0e0ecd2c4f0ddd401aaac0513dcbf7b6f6c65 merge -c1606 branches/stable-1.4: Output vendor Id in hex. diff -r 00c0e0ecd2c4 -r 379e60baa5be master/master.c --- a/master/master.c Mon Jan 26 11:46:02 2009 +0000 +++ b/master/master.c Mon Jan 26 11:46:38 2009 +0000 @@ -1494,7 +1494,7 @@ if (master->debug_level) EC_DBG("ecrt_master_slave_config(master = 0x%x, alias = %u, " - "position = %u, vendor_id = %u, product_code = %u)\n", + "position = %u, vendor_id = 0x%x, product_code = 0x%x)\n", (u32) master, alias, position, vendor_id, product_code); list_for_each_entry(sc, &master->configs, list) {