diff options
| author | Austin Foxley <austinf@cetoncorp.com> | 2010-04-12 06:18:10 -0700 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2010-04-12 06:18:10 -0700 |
| commit | 6cc4f58c6382c850ce97f32f56d1a3ff00ca4585 (patch) | |
| tree | 19a2f25da5db93c2cb620c0da3c38d3bffd0b784 /Makefile.in | |
| parent | c58dd2b2aabda615aa333cdbb023defbf00b30a3 (diff) | |
| parent | e90c33f951efc032ca23f48326343a83c0b54b10 (diff) | |
Merge remote branch 'origin/master' into nptl
Conflicts:
libc/unistd/confstr.c
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 412826f3b..691a59741 100644 --- a/Makefile.in +++ b/Makefile.in @@ -433,7 +433,7 @@ defconfig: $(top_builddir)extra/config/conf -D extra/Configs/defconfigs/$(ARCH) menuconfig-clean-y: - $(Q)$(MAKE) -C extra/config menuconfig_clean + $(Q)$(MAKE) -C extra/config CLEAN_extra/config include_clean: $(Q)$(RM) $(top_builddir)include/fpu_control.h $(top_builddir)include/dl-osinfo.h $(top_builddir)include/hp-timing.h |