diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-07 05:17:13 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-07 05:17:34 -0400 |
| commit | 44347d947f628060b92449702071bfe1d31dfb75 (patch) | |
| tree | c6ed74610d5b3295df4296659f80f5feb94b28cc /scripts/Makefile.build | |
| parent | d94fc523f3c35bd8013f04827e94756cbc0212f4 (diff) | |
| parent | 413f81eba35d6ede9289b0c8a920c013a84fac71 (diff) | |
Merge branch 'linus' into tracing/core
Merge reason: tracing/core was on a .30-rc1 base and was missing out on
on a handful of tracing fixes present in .30-rc5-almost.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'scripts/Makefile.build')
| -rw-r--r-- | scripts/Makefile.build | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 39a9642927d3..5c4b7a400c18 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build | |||
| @@ -27,6 +27,9 @@ ccflags-y := | |||
| 27 | cppflags-y := | 27 | cppflags-y := |
| 28 | ldflags-y := | 28 | ldflags-y := |
| 29 | 29 | ||
| 30 | subdir-asflags-y := | ||
| 31 | subdir-ccflags-y := | ||
| 32 | |||
| 30 | # Read auto.conf if it exists, otherwise ignore | 33 | # Read auto.conf if it exists, otherwise ignore |
| 31 | -include include/config/auto.conf | 34 | -include include/config/auto.conf |
| 32 | 35 | ||