diff options
| author |   Al Viro <viro@zeniv.linux.org.uk> | 2005-10-21 03:22:18 -0400 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 08:16:50 -0700 |
| commit | 1ef64e670e3bc27e0c3c83810ca36e19924c35c6 (patch) | |
| tree | b024df98dcbe0bc28c967559da27a14254698887 /arch | |
| parent | [PATCH] gfp_t: drivers/infiniband (diff) | |
| download | linux-dev-1ef64e670e3bc27e0c3c83810ca36e19924c35c6.tar.xz linux-dev-1ef64e670e3bc27e0c3c83810ca36e19924c35c6.zip | |
[PATCH] gfp_t: sound
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ppc/8xx_io/cs4218.h | 2 | ||||
| -rw-r--r-- | arch/ppc/8xx_io/cs4218_tdm.c | 4 |
2 files changed, 3 insertions, 3 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 { const char *name2; void (*open)(void); void (*release)(void); - void *(*dma_alloc)(unsigned int, int); + void *(*dma_alloc)(unsigned int, gfp_t); void (*dma_free)(void *, unsigned int); int (*irqinit)(void); #ifdef MODULE diff --git a/arch/ppc/8xx_io/cs4218_tdm.c b/arch/ppc/8xx_io/cs4218_tdm.c index 2ca9ec7ec3a7..532caa388dc2 100644 --- a/arch/ppc/8xx_io/cs4218_tdm.c +++ b/arch/ppc/8xx_io/cs4218_tdm.c @@ -318,7 +318,7 @@ struct cs_sound_settings { static struct cs_sound_settings sound; -static void *CS_Alloc(unsigned int size, int flags); +static void *CS_Alloc(unsigned int size, gfp_t flags); static void CS_Free(void *ptr, unsigned int size); static int CS_IrqInit(void); #ifdef MODULE @@ -959,7 +959,7 @@ static TRANS transCSNormalRead = { /*** Low level stuff *********************************************************/ -static void *CS_Alloc(unsigned int size, int flags) +static void *CS_Alloc(unsigned int size, gfp_t flags) { int order; |