diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 18:11:31 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 18:11:31 +0200 |
| commit | 58d4ea65b98f154f3326b038eecda32f90b46ea8 (patch) | |
| tree | 636aed413349dece12c08a4bd3d1fea0254976d8 /sound/aoa/soundbus/sysfs.c | |
| parent | Merge branch 'stable/xen-swiotlb-0.8.6' of git://git.kernel.org/pub/scm/linux... (diff) | |
| parent | mmc_spi: Fix unterminated of_match_table (diff) | |
| download | linux-58d4ea65b98f154f3326b038eecda32f90b46ea8.tar.xz linux-58d4ea65b98f154f3326b038eecda32f90b46ea8.zip | |
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
mmc_spi: Fix unterminated of_match_table
of/sparc: fix build regression from of_device changes
of/device: Replace struct of_device with struct platform_device
Diffstat (limited to 'sound/aoa/soundbus/sysfs.c')
| -rw-r--r-- | sound/aoa/soundbus/sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/aoa/soundbus/sysfs.c b/sound/aoa/soundbus/sysfs.c index 6496e754f00a..e0980b5c2cd8 100644 --- a/sound/aoa/soundbus/sysfs.c +++ b/sound/aoa/soundbus/sysfs.c @@ -16,7 +16,7 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, char *buf) { struct soundbus_dev *sdev = to_soundbus_device(dev); - struct of_device *of = &sdev->ofdev; + struct platform_device *of = &sdev->ofdev; int length; if (*sdev->modalias) { |