diff options
| author | Jon Hunter <jon-hunter@ti.com> | 2013-04-01 15:33:50 -0400 |
|---|---|---|
| committer | Jon Hunter <jon-hunter@ti.com> | 2013-04-01 15:33:50 -0400 |
| commit | dca3a783400a18e2bf4503b1d4a85c4d0ca1a7e4 (patch) | |
| tree | a3689b801070c1360b120b7280c6adc4de5f692a /scripts/sortextable.h | |
| parent | 71856843fb1d8ee455a4c1a60696c74afa4809e5 (diff) | |
| parent | 31d9adca82ce65e5c99d045b5fd917c702b6fce3 (diff) | |
Merge commit '31d9adca82ce65e5c99d045b5fd917c702b6fce3' into tmp
Conflicts:
arch/arm/plat-omap/dmtimer.c
Diffstat (limited to 'scripts/sortextable.h')
| -rw-r--r-- | scripts/sortextable.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/sortextable.h b/scripts/sortextable.h index e4fd45b7e456..f5eb43d42926 100644 --- a/scripts/sortextable.h +++ b/scripts/sortextable.h | |||
| @@ -182,7 +182,7 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort) | |||
| 182 | _r(&sort_needed_sym->st_value) - | 182 | _r(&sort_needed_sym->st_value) - |
| 183 | _r(&sort_needed_sec->sh_addr); | 183 | _r(&sort_needed_sec->sh_addr); |
| 184 | 184 | ||
| 185 | #if 1 | 185 | #if 0 |
| 186 | printf("sort done marker at %lx\n", | 186 | printf("sort done marker at %lx\n", |
| 187 | (unsigned long)((char *)sort_done_location - (char *)ehdr)); | 187 | (unsigned long)((char *)sort_done_location - (char *)ehdr)); |
| 188 | #endif | 188 | #endif |