diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-12-17 09:40:55 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-12-17 09:40:55 -0500 |
commit | 6be7f5344b4fca35f1955aa73f0de825316a3236 (patch) | |
tree | 25ccce9c837fbc7beef026b46852197b637be901 /Makefile | |
parent | df68f106436b684520212494a5ce0e3823b485da (diff) | |
parent | 8246b5b03ef4ab6f29ad8edad859c74b124323cb (diff) |
Merge tag 'asoc-3.8p1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: More updates for v3.8
Nothing terribly exciting here, just small localised changes.
As well as fixes there are a couple of Cirrus changes and one devm_
change which were in prior to the merge window but got missed from the
original pull to Takashi.
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -1,7 +1,7 @@ | |||
1 | VERSION = 3 | 1 | VERSION = 3 |
2 | PATCHLEVEL = 7 | 2 | PATCHLEVEL = 7 |
3 | SUBLEVEL = 0 | 3 | SUBLEVEL = 0 |
4 | EXTRAVERSION = -rc7 | 4 | EXTRAVERSION = |
5 | NAME = Terrified Chipmunk | 5 | NAME = Terrified Chipmunk |
6 | 6 | ||
7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
@@ -1321,10 +1321,12 @@ kernelversion: | |||
1321 | 1321 | ||
1322 | # Clear a bunch of variables before executing the submake | 1322 | # Clear a bunch of variables before executing the submake |
1323 | tools/: FORCE | 1323 | tools/: FORCE |
1324 | $(Q)$(MAKE) LDFLAGS= MAKEFLAGS= -C $(src)/tools/ | 1324 | $(Q)mkdir -p $(objtree)/tools |
1325 | $(Q)$(MAKE) LDFLAGS= MAKEFLAGS= O=$(objtree) subdir=tools -C $(src)/tools/ | ||
1325 | 1326 | ||
1326 | tools/%: FORCE | 1327 | tools/%: FORCE |
1327 | $(Q)$(MAKE) LDFLAGS= MAKEFLAGS= -C $(src)/tools/ $* | 1328 | $(Q)mkdir -p $(objtree)/tools |
1329 | $(Q)$(MAKE) LDFLAGS= MAKEFLAGS= O=$(objtree) subdir=tools -C $(src)/tools/ $* | ||
1328 | 1330 | ||
1329 | # Single targets | 1331 | # Single targets |
1330 | # --------------------------------------------------------------------------- | 1332 | # --------------------------------------------------------------------------- |