diff options
author | Michal Marek | 2010-08-20 13:53:08 +0200 |
---|---|---|
committer | Michal Marek | 2010-08-20 13:53:08 +0200 |
commit | e981b060767b3c4ac9393ad8d2558d648e35dfcb (patch) | |
tree | 9c05eaec3072be3645dda61d35085d152b9d5954 /sound/aoa/soundbus/core.c | |
parent | fixes for using make 3.82 (diff) | |
parent | Linux 2.6.36-rc1 (diff) | |
download | kernel-qcow2-linux-e981b060767b3c4ac9393ad8d2558d648e35dfcb.tar.gz kernel-qcow2-linux-e981b060767b3c4ac9393ad8d2558d648e35dfcb.tar.xz kernel-qcow2-linux-e981b060767b3c4ac9393ad8d2558d648e35dfcb.zip |
Merge commit 'v2.6.36-rc1' into kbuild/rc-fixes
Diffstat (limited to 'sound/aoa/soundbus/core.c')
-rw-r--r-- | sound/aoa/soundbus/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/aoa/soundbus/core.c b/sound/aoa/soundbus/core.c index 99ca7120e269..7487eb76e034 100644 --- a/sound/aoa/soundbus/core.c +++ b/sound/aoa/soundbus/core.c @@ -59,7 +59,7 @@ static int soundbus_probe(struct device *dev) static int soundbus_uevent(struct device *dev, struct kobj_uevent_env *env) { struct soundbus_dev * soundbus_dev; - struct of_device * of; + struct platform_device * of; const char *compat; int retval = 0; int cplen, seen = 0; |