diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-05-12 14:53:40 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-05-12 14:53:40 +0800 |
| commit | 8134585f1c33565ea5e752a7ba9323ed3e0921f3 (patch) | |
| tree | 1fd22479884783bb498702169de744b513dd68f7 /tools | |
| parent | 05f74e8baccb60882ace4d0165887368e8143f3f (diff) | |
| parent | 9182148a5315d4b1de68ac74fd54cbb5da5a3703 (diff) | |
Merge tag 'v3.10.77' into linux-linaro-lsk
This is the 3.10.77 stable release
Conflicts:
drivers/video/console/Kconfig
scripts/kconfig/menu.c
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/power/x86/turbostat/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/power/x86/turbostat/Makefile b/tools/power/x86/turbostat/Makefile index d1b3a361e526..4039854560d0 100644 --- a/tools/power/x86/turbostat/Makefile +++ b/tools/power/x86/turbostat/Makefile @@ -1,8 +1,12 @@ CC = $(CROSS_COMPILE)gcc -BUILD_OUTPUT := $(PWD) +BUILD_OUTPUT := $(CURDIR) PREFIX := /usr DESTDIR := +ifeq ("$(origin O)", "command line") + BUILD_OUTPUT := $(O) +endif + turbostat : turbostat.c CFLAGS += -Wall CFLAGS += -DMSRHEADER='"../../../../arch/x86/include/uapi/asm/msr-index.h"' |