diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /arch/ppc/8xx_io/cs4218.h | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'arch/ppc/8xx_io/cs4218.h')
| -rw-r--r-- | arch/ppc/8xx_io/cs4218.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/8xx_io/cs4218.h b/arch/ppc/8xx_io/cs4218.h index a3c38c5a5db2..f1c7392255f8 100644 --- a/arch/ppc/8xx_io/cs4218.h +++ b/arch/ppc/8xx_io/cs4218.h | |||
| @@ -78,7 +78,7 @@ typedef struct { | |||
| 78 | const char *name2; | 78 | const char *name2; |
| 79 | void (*open)(void); | 79 | void (*open)(void); |
| 80 | void (*release)(void); | 80 | void (*release)(void); |
| 81 | void *(*dma_alloc)(unsigned int, int); | 81 | void *(*dma_alloc)(unsigned int, gfp_t); |
| 82 | void (*dma_free)(void *, unsigned int); | 82 | void (*dma_free)(void *, unsigned int); |
| 83 | int (*irqinit)(void); | 83 | int (*irqinit)(void); |
| 84 | #ifdef MODULE | 84 | #ifdef MODULE |