projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
[powerpc.git]
/
sound
/
aoa
/
aoa.h
diff --git
a/sound/aoa/aoa.h
b/sound/aoa/aoa.h
index
378ef1e
..
e087894
100644
(file)
--- a/
sound/aoa/aoa.h
+++ b/
sound/aoa/aoa.h
@@
-10,8
+10,6
@@
#define __AOA_H
#include <asm/prom.h>
#include <linux/module.h>
#define __AOA_H
#include <asm/prom.h>
#include <linux/module.h>
-/* So apparently there's a reason for requiring driver.h to be included first! */
-#include <sound/driver.h>
#include <sound/core.h>
#include <sound/asound.h>
#include <sound/control.h>
#include <sound/core.h>
#include <sound/asound.h>
#include <sound/control.h>
@@
-99,7
+97,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