diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-05 14:58:01 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-05 14:58:04 +1100 |
| commit | 7f1546329db7b573f3a640d75cc1af40dc5ee9ed (patch) | |
| tree | 2fe1446a800cfd5a5f52b3bdc16f9dd43968eb57 /tools/perf/ui/gtk/setup.c | |
| parent | ddb758d5bb04265c29afbec3496f4b2f2fc2aa09 (diff) | |
| parent | f497c33a948932e2a11b71d1ea07b2eedbc2f0d7 (diff) | |
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/h8300/include/asm/Kbuild
include/linux/acpi.h
include/linux/wait.h
tools/perf/config/Makefile
tools/perf/config/feature-tests.mak
Diffstat (limited to 'tools/perf/ui/gtk/setup.c')
| -rw-r--r-- | tools/perf/ui/gtk/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/ui/gtk/setup.c b/tools/perf/ui/gtk/setup.c index 6c2dd2e423f3..1d57676f8212 100644 --- a/tools/perf/ui/gtk/setup.c +++ b/tools/perf/ui/gtk/setup.c @@ -8,7 +8,7 @@ int perf_gtk__init(void) { perf_error__register(&perf_gtk_eops); perf_gtk__init_helpline(); - perf_gtk__init_progress(); + gtk_ui_progress__init(); perf_gtk__init_hpp(); return gtk_init_check(NULL, NULL) ? 0 : -1; |