diff options
Diffstat (limited to 'arch/cris/arch-v32/kernel')
-rw-r--r-- | arch/cris/arch-v32/kernel/arbiter.c | 8 | ||||
-rw-r--r-- | arch/cris/arch-v32/kernel/dma.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/cris/arch-v32/kernel/arbiter.c b/arch/cris/arch-v32/kernel/arbiter.c index 3870d2fd5160..c741a9bf26d4 100644 --- a/arch/cris/arch-v32/kernel/arbiter.c +++ b/arch/cris/arch-v32/kernel/arbiter.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /* | 1 | /* |
2 | * Memory arbiter functions. Allocates bandwith through the | 2 | * Memory arbiter functions. Allocates bandwidth through the |
3 | * arbiter and sets up arbiter breakpoints. | 3 | * arbiter and sets up arbiter breakpoints. |
4 | * | 4 | * |
5 | * The algorithm first assigns slots to the clients that has specified | 5 | * The algorithm first assigns slots to the clients that has specified |
6 | * bandwith (e.g. ethernet) and then the remaining slots are divided | 6 | * bandwidth (e.g. ethernet) and then the remaining slots are divided |
7 | * on all the active clients. | 7 | * on all the active clients. |
8 | * | 8 | * |
9 | * Copyright (c) 2004, 2005 Axis Communications AB. | 9 | * Copyright (c) 2004, 2005 Axis Communications AB. |
@@ -133,8 +133,8 @@ static void crisv32_arbiter_init(void) | |||
133 | 133 | ||
134 | 134 | ||
135 | 135 | ||
136 | int crisv32_arbiter_allocate_bandwith(int client, int region, | 136 | int crisv32_arbiter_allocate_bandwidth(int client, int region, |
137 | unsigned long bandwidth) | 137 | unsigned long bandwidth) |
138 | { | 138 | { |
139 | int i; | 139 | int i; |
140 | int total_assigned = 0; | 140 | int total_assigned = 0; |
diff --git a/arch/cris/arch-v32/kernel/dma.c b/arch/cris/arch-v32/kernel/dma.c index b92e85799b44..570e19128ffd 100644 --- a/arch/cris/arch-v32/kernel/dma.c +++ b/arch/cris/arch-v32/kernel/dma.c | |||
@@ -25,8 +25,8 @@ int crisv32_request_dma(unsigned int dmanr, const char * device_id, | |||
25 | reg_config_rw_clk_ctrl clk_ctrl; | 25 | reg_config_rw_clk_ctrl clk_ctrl; |
26 | reg_strmux_rw_cfg strmux_cfg; | 26 | reg_strmux_rw_cfg strmux_cfg; |
27 | 27 | ||
28 | if (crisv32_arbiter_allocate_bandwith(dmanr, | 28 | if (crisv32_arbiter_allocate_bandwidth(dmanr, |
29 | options & DMA_INT_MEM ? INT_REGION : EXT_REGION, | 29 | options & DMA_INT_MEM ? INT_REGION : EXT_REGION, |
30 | bandwidth)) | 30 | bandwidth)) |
31 | return -ENOMEM; | 31 | return -ENOMEM; |
32 | 32 | ||