diff -r e5ceb7cd20b5 -r 5f35e74124d1 master/master.c --- a/master/master.c Tue Jul 25 10:19:40 2006 +0000 +++ b/master/master.c Fri Jul 28 07:36:55 2006 +0000 @@ -55,7 +55,7 @@ /*****************************************************************************/ -void ec_master_idle(void *); +void ec_master_idle_run(void *); void ec_master_eoe_run(unsigned long); ssize_t ec_show_master_attribute(struct kobject *, struct attribute *, char *); ssize_t ec_store_master_attribute(struct kobject *, struct attribute *, @@ -116,7 +116,7 @@ INIT_LIST_HEAD(&master->domains); INIT_LIST_HEAD(&master->eoe_handlers); ec_datagram_init(&master->simple_datagram); - INIT_WORK(&master->idle_work, ec_master_idle, (void *) master); + INIT_WORK(&master->idle_work, ec_master_idle_run, (void *) master); init_timer(&master->eoe_timer); master->eoe_timer.function = ec_master_eoe_run; master->eoe_timer.data = (unsigned long) master; @@ -724,7 +724,7 @@ Idle mode function. */ -void ec_master_idle(void *data /**< master pointer */) +void ec_master_idle_run(void *data /**< master pointer */) { ec_master_t *master = (ec_master_t *) data;