diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-02-05 13:27:01 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-02-05 13:27:01 +0400 |
| commit | c5f3d69e1c4ebd207a63e20b26280a47552621c1 (patch) | |
| tree | 895fdbafd2fb608c5936b6ab3b84e2abab33cb2a | |
| parent | 9887435a5b1d34edf7e8bfb5942657eb55247c9c (diff) | |
| parent | a4af495cd80fec58162fe9be9c8bdbbac26fbd16 (diff) | |
Merge branch 'tracking-llct-misc-fixes' into merge-linux-linaro-core-trackingllct-20140205.1
| -rw-r--r-- | fs/btrfs/Kconfig | 1 | ||||
| -rw-r--r-- | tools/perf/Makefile.perf | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/fs/btrfs/Kconfig b/fs/btrfs/Kconfig index a66768ebc8d1..3def5122904a 100644 --- a/fs/btrfs/Kconfig +++ b/fs/btrfs/Kconfig @@ -1,5 +1,6 @@ config BTRFS_FS tristate "Btrfs filesystem support" + select LIBCRC32C select CRYPTO select CRYPTO_CRC32C select ZLIB_INFLATE diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 7257e7e9e38a..3749a8b0daee 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -738,13 +738,13 @@ LIBAPIKFS_SOURCES = $(wildcard $(LIB_PATH)fs/*.[ch]) # already $(LIBAPIKFS): $(LIBAPIKFS_SOURCES) ifeq ($(subdir),) - $(QUIET_SUBDIR0)$(LIB_DIR) $(QUIET_SUBDIR1) O=$(OUTPUT) libapikfs.a + $(QUIET_SUBDIR0)$(LIB_DIR) $(QUIET_SUBDIR1) CROSS_COMPILE=$(CROSS_COMPILE) O=$(OUTPUT) libapikfs.a endif $(LIBAPIKFS)-clean: ifeq ($(subdir),) $(call QUIET_CLEAN, libapikfs) - @$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) clean >/dev/null + @$(MAKE) -C $(LIB_DIR) CROSS_COMPILE=$(CROSS_COMPILE) O=$(OUTPUT) clean >/dev/null endif help: |