diff options
Diffstat (limited to 'arch/cris/arch-v32/kernel/arbiter.c')
-rw-r--r-- | arch/cris/arch-v32/kernel/arbiter.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/cris/arch-v32/kernel/arbiter.c b/arch/cris/arch-v32/kernel/arbiter.c index 3870d2fd5160..420a5312ed03 100644 --- a/arch/cris/arch-v32/kernel/arbiter.c +++ b/arch/cris/arch-v32/kernel/arbiter.c | |||
@@ -1,15 +1,14 @@ | |||
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. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <linux/config.h> | ||
13 | #include <asm/arch/hwregs/reg_map.h> | 12 | #include <asm/arch/hwregs/reg_map.h> |
14 | #include <asm/arch/hwregs/reg_rdwr.h> | 13 | #include <asm/arch/hwregs/reg_rdwr.h> |
15 | #include <asm/arch/hwregs/marb_defs.h> | 14 | #include <asm/arch/hwregs/marb_defs.h> |
@@ -120,7 +119,7 @@ static void crisv32_arbiter_init(void) | |||
120 | crisv32_arbiter_config(EXT_REGION); | 119 | crisv32_arbiter_config(EXT_REGION); |
121 | crisv32_arbiter_config(INT_REGION); | 120 | crisv32_arbiter_config(INT_REGION); |
122 | 121 | ||
123 | if (request_irq(MEMARB_INTR_VECT, crisv32_arbiter_irq, SA_INTERRUPT, | 122 | if (request_irq(MEMARB_INTR_VECT, crisv32_arbiter_irq, IRQF_DISABLED, |
124 | "arbiter", NULL)) | 123 | "arbiter", NULL)) |
125 | printk(KERN_ERR "Couldn't allocate arbiter IRQ\n"); | 124 | printk(KERN_ERR "Couldn't allocate arbiter IRQ\n"); |
126 | 125 | ||
@@ -133,8 +132,8 @@ static void crisv32_arbiter_init(void) | |||
133 | 132 | ||
134 | 133 | ||
135 | 134 | ||
136 | int crisv32_arbiter_allocate_bandwith(int client, int region, | 135 | int crisv32_arbiter_allocate_bandwidth(int client, int region, |
137 | unsigned long bandwidth) | 136 | unsigned long bandwidth) |
138 | { | 137 | { |
139 | int i; | 138 | int i; |
140 | int total_assigned = 0; | 139 | int total_assigned = 0; |