diff options
| author | Michal Marek <mmarek@suse.cz> | 2011-03-09 10:15:44 -0500 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2011-03-09 10:15:44 -0500 |
| commit | 2d8ad8719591fa803b0d589ed057fa46f49b7155 (patch) | |
| tree | 4ae051577dad1161c91dafbf4207bb10a9dc91bb /scripts | |
| parent | 9b4ce7bce5f30712fd926ab4599a803314a07719 (diff) | |
| parent | c56eb8fb6dccb83d9fe62fd4dc00c834de9bc470 (diff) | |
Merge commit 'v2.6.38-rc1' into kbuild/packaging
Diffstat (limited to 'scripts')
117 files changed, 8852 insertions, 3644 deletions
diff --git a/scripts/.gitignore b/scripts/.gitignore index 52cab46ae35..e2741d23bab 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore | |||
| @@ -6,5 +6,5 @@ kallsyms | |||
| 6 | pnmtologo | 6 | pnmtologo |
| 7 | bin2c | 7 | bin2c |
| 8 | unifdef | 8 | unifdef |
| 9 | binoffset | ||
| 10 | ihex2fw | 9 | ihex2fw |
| 10 | recordmcount | ||
diff --git a/scripts/Makefile b/scripts/Makefile index 842dbc2d5ae..2e088109fbd 100644 --- a/scripts/Makefile +++ b/scripts/Makefile | |||
| @@ -11,6 +11,7 @@ hostprogs-$(CONFIG_KALLSYMS) += kallsyms | |||
| 11 | hostprogs-$(CONFIG_LOGO) += pnmtologo | 11 | hostprogs-$(CONFIG_LOGO) += pnmtologo |
| 12 | hostprogs-$(CONFIG_VT) += conmakehash | 12 | hostprogs-$(CONFIG_VT) += conmakehash |
| 13 | hostprogs-$(CONFIG_IKCONFIG) += bin2c | 13 | hostprogs-$(CONFIG_IKCONFIG) += bin2c |
| 14 | hostprogs-$(BUILD_C_RECORDMCOUNT) += recordmcount | ||
| 14 | 15 | ||
| 15 | always := $(hostprogs-y) $(hostprogs-m) | 16 | always := $(hostprogs-y) $(hostprogs-m) |
| 16 | 17 | ||
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index e4deb73e9a8..4eb99ab3405 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build | |||
| @@ -115,7 +115,10 @@ endif | |||
| 115 | # --------------------------------------------------------------------------- | 115 | # --------------------------------------------------------------------------- |