diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-12-09 20:12:25 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-12-09 20:12:25 +0400 |
| commit | 923cd99acdf840efb3ca6d67e6de0c2d379f3c76 (patch) | |
| tree | 4ce8bc3206ca0f959290ca04c29e7d5e5a84a148 | |
| parent | be3a52daf7661cc1bd2954ffcd5d099081b6127e (diff) | |
| parent | d47d7be717dce2cc84828aa90c08714a32e6a551 (diff) | |
Merge branch 'tracking-llct-v3.13-misc-fixes' into merge-linux-linaro-core-trackingtracking-llct-ll-20131212.0tracking-llct-ll-20131210.0llct-20131209.0
| -rw-r--r-- | drivers/usb/misc/usb3503.c | 2 | ||||
| -rw-r--r-- | tools/perf/Makefile.perf | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/misc/usb3503.c b/drivers/usb/misc/usb3503.c index a31641e18d19..ad8368d96665 100644 --- a/drivers/usb/misc/usb3503.c +++ b/drivers/usb/misc/usb3503.c @@ -339,7 +339,7 @@ static int __init usb3503_init(void) return 0; } -module_init(usb3503_init); +late_initcall(usb3503_init); static void __exit usb3503_exit(void) { diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 7fc8f179cae7..85b25a16b26d 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -723,13 +723,13 @@ LIBLK_SOURCES = $(wildcard $(LK_PATH)*.[ch]) # already $(LIBLK): $(LIBLK_SOURCES) ifeq ($(subdir),) - $(QUIET_SUBDIR0)$(LK_DIR) $(QUIET_SUBDIR1) O=$(OUTPUT) liblk.a + $(QUIET_SUBDIR0)$(LK_DIR) $(QUIET_SUBDIR1) CROSS_COMPILE=$(CROSS_COMPILE) O=$(OUTPUT) liblk.a endif $(LIBLK)-clean: ifeq ($(subdir),) $(call QUIET_CLEAN, liblk) - @$(MAKE) -C $(LK_DIR) O=$(OUTPUT) clean >/dev/null + @$(MAKE) -C $(LK_DIR) CROSS_COMPILE=$(CROSS_COMPILE) O=$(OUTPUT) clean >/dev/null endif help: |