diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-07-24 11:42:34 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-07-24 11:42:34 +0200 |
commit | 43cbd286fbba4bfb0c2ef05dc62522dfd5a2c000 (patch) | |
tree | 7184a24f04c72987e725e50e66db530e6f618220 /arch/s390/kernel/perf_cpum_cf.c | |
parent | fee4b700a4e9e446151eb5a03874ca8666323113 (diff) | |
parent | c5ae4dca11523dff15cfb1763b64a71b805976aa (diff) | |
download | talos-obmc-linux-43cbd286fbba4bfb0c2ef05dc62522dfd5a2c000.tar.gz talos-obmc-linux-43cbd286fbba4bfb0c2ef05dc62522dfd5a2c000.zip |
Merge tag 'asoc-v3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.11
A few small updates again, the sgtl5000 one fixes some newly triggered
issues due to some probe ordering changes which were introduced in the
last merge window.
Diffstat (limited to 'arch/s390/kernel/perf_cpum_cf.c')
-rw-r--r-- | arch/s390/kernel/perf_cpum_cf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kernel/perf_cpum_cf.c b/arch/s390/kernel/perf_cpum_cf.c index 390d9ae57bb2..fb99c2057b85 100644 --- a/arch/s390/kernel/perf_cpum_cf.c +++ b/arch/s390/kernel/perf_cpum_cf.c @@ -639,8 +639,8 @@ static struct pmu cpumf_pmu = { .cancel_txn = cpumf_pmu_cancel_txn, }; -static int __cpuinit cpumf_pmu_notifier(struct notifier_block *self, - unsigned long action, void *hcpu) +static int cpumf_pmu_notifier(struct notifier_block *self, unsigned long action, + void *hcpu) { unsigned int cpu = (long) hcpu; int flags; |