git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
ppc
/
8xx_io
/
cs4218.h
diff --git
a/arch/ppc/8xx_io/cs4218.h
b/arch/ppc/8xx_io/cs4218.h
index
a3c38c5
..
e5f9430
100644
(file)
--- a/
arch/ppc/8xx_io/cs4218.h
+++ b/
arch/ppc/8xx_io/cs4218.h
@@
-13,7
+13,6
@@
#define _cs4218_h_
#include <linux/types.h>
#define _cs4218_h_
#include <linux/types.h>
-#include <linux/config.h>
#define SND_NDEVS 256 /* Number of supported devices */
#define SND_DEV_CTL 0 /* Control port /dev/mixer */
#define SND_NDEVS 256 /* Number of supported devices */
#define SND_DEV_CTL 0 /* Control port /dev/mixer */
@@
-78,7
+77,7
@@
typedef struct {
const char *name2;
void (*open)(void);
void (*release)(void);
const char *name2;
void (*open)(void);
void (*release)(void);
- void *(*dma_alloc)(unsigned int,
in
t);
+ void *(*dma_alloc)(unsigned int,
gfp_
t);
void (*dma_free)(void *, unsigned int);
int (*irqinit)(void);
#ifdef MODULE
void (*dma_free)(void *, unsigned int);
int (*irqinit)(void);
#ifdef MODULE