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 /include/linux/kernel.h | |
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 'include/linux/kernel.h')
-rw-r--r-- | include/linux/kernel.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index a123b13b70fd..7d8dfc7392f1 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
@@ -701,6 +701,13 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } | |||
701 | #define COMPACTION_BUILD 0 | 701 | #define COMPACTION_BUILD 0 |
702 | #endif | 702 | #endif |
703 | 703 | ||
704 | /* This helps us to avoid #ifdef CONFIG_SYMBOL_PREFIX */ | ||
705 | #ifdef CONFIG_SYMBOL_PREFIX | ||
706 | #define SYMBOL_PREFIX CONFIG_SYMBOL_PREFIX | ||
707 | #else | ||
708 | #define SYMBOL_PREFIX "" | ||
709 | #endif | ||
710 | |||
704 | /* Rebuild everything on CONFIG_FTRACE_MCOUNT_RECORD */ | 711 | /* Rebuild everything on CONFIG_FTRACE_MCOUNT_RECORD */ |
705 | #ifdef CONFIG_FTRACE_MCOUNT_RECORD | 712 | #ifdef CONFIG_FTRACE_MCOUNT_RECORD |
706 | # define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD | 713 | # define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD |