diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 15:23:35 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 15:23:35 +0100 |
commit | 3642a0a2c7d2d1949988d0fd004a8039c1f3d02f (patch) | |
tree | e687c88b1b66ad51a6a6c529f7f328f2d3b625fa /sound/soc/fsl/fsl_ssi.c | |
parent | Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers (diff) | |
parent | ARM: mx28evk: set a initial clock rate for saif (diff) | |
download | linux-3642a0a2c7d2d1949988d0fd004a8039c1f3d02f.tar.xz linux-3642a0a2c7d2d1949988d0fd004a8039c1f3d02f.zip |
Merge branch 'mxs/saif' into next/drivers
Conflicts:
drivers/net/ethernet/cadence/Kconfig
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; |