From bcbfad7e45fd0dc4a48f8f8beee03aa4fd8f201a Mon Sep 17 00:00:00 2001 From: Ahmed El-Shafiey Date: Sun, 9 Dec 2012 19:48:05 -0800 Subject: Merging //depot/gpgpu_sim_research/fermi_power/... to //depot/gpgpu_sim_research/fermi/... [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 14777] --- src/gpgpu-sim/power_interface.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gpgpu-sim/power_interface.h') diff --git a/src/gpgpu-sim/power_interface.h b/src/gpgpu-sim/power_interface.h index 3033743..9bce430 100644 --- a/src/gpgpu-sim/power_interface.h +++ b/src/gpgpu-sim/power_interface.h @@ -37,7 +37,7 @@ void init_mcpat(const gpgpu_sim_config &config, class gpgpu_sim_wrapper *wrapper, unsigned stat_sample_freq, unsigned tot_inst, unsigned inst); void mcpat_cycle(const gpgpu_sim_config &config, const struct shader_core_config *shdr_config, class gpgpu_sim_wrapper *wrapper, class power_stat_t *power_stats, - unsigned stat_sample_freq, unsigned tot_cycle, unsigned cycle, unsigned tot_inst, unsigned inst); +unsigned stat_sample_freq, unsigned tot_cycle, unsigned cycle, unsigned tot_inst, unsigned inst); #endif /* POWER_INTERFACE_H_ */ -- cgit v1.3