diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-19 17:02:14 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-19 17:02:14 +0900 |
| commit | 80da549e5225c6f80d45f76ba2b3a4574ed278ae (patch) | |
| tree | 59799c3d7b7d4a088abdfa3052c3682ed826ba7e /scripts/Makefile.asm-generic | |
| parent | f017eb299c3ac219215ce896718ea128ad9343eb (diff) | |
| parent | f4a75d2eb7b1e2206094b901be09adb31ba63681 (diff) | |
Merge tag 'v3.7-rc6' into asoc-wm2200
Linux 3.7-rc6
Diffstat (limited to 'scripts/Makefile.asm-generic')
| -rw-r--r-- | scripts/Makefile.asm-generic | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Makefile.asm-generic b/scripts/Makefile.asm-generic index 40caf3c26cd..d17e0ea911e 100644 --- a/scripts/Makefile.asm-generic +++ b/scripts/Makefile.asm-generic @@ -5,7 +5,7 @@ # and for each file listed in this file with generic-y creates # a small wrapper file in $(obj) (arch/$(SRCARCH)/include/generated/asm) -kbuild-file := $(srctree)/arch/$(SRCARCH)/include/asm/Kbuild +kbuild-file := $(srctree)/arch/$(SRCARCH)/include/$(src)/Kbuild -include $(kbuild-file) include scripts/Kbuild.include |