diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 13:55:03 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 13:55:03 +0100 |
| commit | 4c5f830c4c9d4f19c1eef356c0cd322b46d695c9 (patch) | |
| tree | a14ad6c652736bb28859a7aec392a01b236ae58d /sound/soc/fsl/fsl_ssi.c | |
| parent | ARM: 7257/1: EXYNOS: introduce arch/arm/mach-exynos/common.[ch] (diff) | |
| parent | arm: Remove plat-tcc directory (diff) | |
| download | linux-4c5f830c4c9d4f19c1eef356c0cd322b46d695c9.tar.xz linux-4c5f830c4c9d4f19c1eef356c0cd322b46d695c9.zip | |
Merge branch 'for-russell' of git://hansjkoch.de/git/linux-tcc into HEAD
Conflicts:
arch/arm/plat-omap/include/plat/common.h
Diffstat (limited to 'sound/soc/fsl/fsl_ssi.c')
| -rw-r--r-- | sound/soc/fsl/fsl_ssi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 0268cf989736..83c4bd5b2dd7 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -694,6 +694,7 @@ static int __devinit fsl_ssi_probe(struct platform_device *pdev) /* Initialize the the device_attribute structure */ dev_attr = &ssi_private->dev_attr; + sysfs_attr_init(&dev_attr->attr); dev_attr->attr.name = "statistics"; dev_attr->attr.mode = S_IRUGO; dev_attr->show = fsl_sysfs_ssi_show; |