summaryrefslogtreecommitdiffstats
path: root/sound/soc/au1x/psc-i2s.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-07-31 15:19:22 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-07-31 15:19:22 +0200
commitf13b1035ce8bbc27d4ce7c281cddd2718f2cf5b0 (patch)
tree44419bd03c33e662302dd003f57d36e133144f91 /sound/soc/au1x/psc-i2s.c
parentMerge branch 'l7200' into devel (diff)
parentARM: 6277/1: mach-shmobile: Allow users to select HZ, default to 128 (diff)
downloadlinux-f13b1035ce8bbc27d4ce7c281cddd2718f2cf5b0.tar.xz
linux-f13b1035ce8bbc27d4ce7c281cddd2718f2cf5b0.zip
Merge branch 'shmobile' into devel
Diffstat (limited to 'sound/soc/au1x/psc-i2s.c')
-rw-r--r--sound/soc/au1x/psc-i2s.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/au1x/psc-i2s.c b/sound/soc/au1x/psc-i2s.c
index 495be6e71931..24454c98d0ee 100644
--- a/sound/soc/au1x/psc-i2s.c
+++ b/sound/soc/au1x/psc-i2s.c
@@ -300,7 +300,7 @@ struct snd_soc_dai au1xpsc_i2s_dai = {
};
EXPORT_SYMBOL(au1xpsc_i2s_dai);
-static int __init au1xpsc_i2s_drvprobe(struct platform_device *pdev)
+static int __devinit au1xpsc_i2s_drvprobe(struct platform_device *pdev)
{
struct resource *r;
unsigned long sel;