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.

1 files changed, 4 insertions, 7 deletions

diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c
index 11d460f6f9cc..62d6b153ffa2 100644
--- a/arch/sparc/kernel/ds.c
+++ b/arch/sparc/kernel/ds.c
@@ -528,10 +528,8 @@ static void dr_cpu_mark(struct ds_data *resp, int cpu, int ncpus,
         }
 }
 
-static int __cpuinit dr_cpu_configure(struct ds_info *dp,
-                                      struct ds_cap_state *cp,
-                                      u64 req_num,
-                                      cpumask_t *mask)
+static int dr_cpu_configure(struct ds_info *dp, struct ds_cap_state *cp,
+                            u64 req_num, cpumask_t *mask)
 {
         struct ds_data *resp;
         int resp_len, ncpus, cpu;
@@ -627,9 +625,8 @@ static int dr_cpu_unconfigure(struct ds_info *dp,
         return 0;
 }
 
-static void __cpuinit dr_cpu_data(struct ds_info *dp,
-                                  struct ds_cap_state *cp,
-                                  void *buf, int len)
+static void dr_cpu_data(struct ds_info *dp, struct ds_cap_state *cp, void *buf,
+                        int len)
 {
         struct ds_data *data = buf;
         struct dr_cpu_tag *tag = (struct dr_cpu_tag *) (data + 1);