projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
[powerpc.git]
/
sound
/
aoa
/
aoa.h
diff --git
a/sound/aoa/aoa.h
b/sound/aoa/aoa.h
index
378ef1e
..
541b908
100644
(file)
--- a/
sound/aoa/aoa.h
+++ b/
sound/aoa/aoa.h
@@
-99,7
+99,7
@@
struct aoa_fabric {
* that are not assigned yet are passed to the fabric
* again for reconsideration. */
extern int
* that are not assigned yet are passed to the fabric
* again for reconsideration. */
extern int
-aoa_fabric_register(struct aoa_fabric *fabric);
+aoa_fabric_register(struct aoa_fabric *fabric
, struct device *dev
);
/* it is vital to call this when the fabric exits!
* When calling, the remove_codec will be called
/* it is vital to call this when the fabric exits!
* When calling, the remove_codec will be called