diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:30:16 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:30:16 -0400 |
| commit | 15dbb5a3f971a28040ae6cbcd8bbdf19b629fa83 (patch) | |
| tree | e65562d7300ac653207b1e45ec7e5960ddf78fff /arch/sh/cchips/voyagergx | |
| parent | be697c3f137c9ed808753bbbc5d7751c6e5303fc (diff) | |
| parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/sh/cchips/voyagergx')
| -rw-r--r-- | arch/sh/cchips/voyagergx/consistent.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/cchips/voyagergx/consistent.c b/arch/sh/cchips/voyagergx/consistent.c index 5b92585a38d..3d9a02c093a 100644 --- a/arch/sh/cchips/voyagergx/consistent.c +++ b/arch/sh/cchips/voyagergx/consistent.c | |||
| @@ -31,7 +31,7 @@ static LIST_HEAD(voya_alloc_list); | |||
| 31 | #define OHCI_SRAM_SIZE 0x10000 | 31 | #define OHCI_SRAM_SIZE 0x10000 |
| 32 | 32 | ||
| 33 | void *voyagergx_consistent_alloc(struct device *dev, size_t size, | 33 | void *voyagergx_consistent_alloc(struct device *dev, size_t size, |
| 34 | dma_addr_t *handle, int flag) | 34 | dma_addr_t *handle, gfp_t flag) |
| 35 | { | 35 | { |
| 36 | struct list_head *list = &voya_alloc_list; | 36 | struct list_head *list = &voya_alloc_list; |
| 37 | struct voya_alloc_entry *entry; | 37 | struct voya_alloc_entry *entry; |