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, 3 insertions, 3 deletions

diff --git a/Documentation/cpu-hotplug.txt b/Documentation/cpu-hotplug.txt
index edd4b4df3932..786dc82f98ce 100644
--- a/Documentation/cpu-hotplug.txt
+++ b/Documentation/cpu-hotplug.txt
@@ -267,8 +267,8 @@ Q: If i have some kernel code that needs to be aware of CPU arrival and
 A: This is what you would need in your kernel code to receive notifications.
 
         #include <linux/cpu.h>
-        static int __cpuinit foobar_cpu_callback(struct notifier_block *nfb,
-                                            unsigned long action, void *hcpu)
+        static int foobar_cpu_callback(struct notifier_block *nfb,
+                                       unsigned long action, void *hcpu)
         {
                 unsigned int cpu = (unsigned long)hcpu;
 
@@ -285,7 +285,7 @@ A: This is what you would need in your kernel code to receive notifications.
                 return NOTIFY_OK;
         }
 
-        static struct notifier_block __cpuinitdata foobar_cpu_notifer =
+        static struct notifier_block foobar_cpu_notifer =
         {
            .notifier_call = foobar_cpu_callback,
         };