diff options
author | Roland Dreier <rolandd@cisco.com> | 2005-10-28 15:50:51 -0700 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2005-10-28 15:50:51 -0700 |
commit | a4da0628efd788eb199dd9df225e296035ec2539 (patch) | |
tree | 1e611030c993e1480dc2f07f26976d2d33002b0d /sound/oss/dmasound/dmasound.h | |
parent | 70a30e16a8a9d22396a4d1e96af86e43594df584 (diff) | |
parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'sound/oss/dmasound/dmasound.h')
-rw-r--r-- | sound/oss/dmasound/dmasound.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/dmasound/dmasound.h b/sound/oss/dmasound/dmasound.h index 9a2f50f0b184..222014cafc1a 100644 --- a/sound/oss/dmasound/dmasound.h +++ b/sound/oss/dmasound/dmasound.h @@ -116,7 +116,7 @@ typedef struct { const char *name; const char *name2; struct module *owner; - void *(*dma_alloc)(unsigned int, int); + void *(*dma_alloc)(unsigned int, gfp_t); void (*dma_free)(void *, unsigned int); int (*irqinit)(void); #ifdef MODULE |