diff options
author | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
---|---|---|
committer | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
commit | dba0a918722ee0f0ba3442575e4448c3ab622be4 (patch) | |
tree | fdb466cf09e7916135098d651b18924b2fe9ba5f /include/asm-cris/arch-v32/mach-fs/arbiter.h | |
parent | 0996e6382482ce9014787693d3884e9468153a5c (diff) | |
parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'include/asm-cris/arch-v32/mach-fs/arbiter.h')
-rw-r--r-- | include/asm-cris/arch-v32/mach-fs/arbiter.h | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/include/asm-cris/arch-v32/mach-fs/arbiter.h b/include/asm-cris/arch-v32/mach-fs/arbiter.h deleted file mode 100644 index a2e0ec8faa7d..000000000000 --- a/include/asm-cris/arch-v32/mach-fs/arbiter.h +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | #ifndef _ASM_CRIS_ARCH_ARBITER_H | ||
2 | #define _ASM_CRIS_ARCH_ARBITER_H | ||
3 | |||
4 | #define EXT_REGION 0 | ||
5 | #define INT_REGION 1 | ||
6 | |||
7 | typedef void (watch_callback)(void); | ||
8 | |||
9 | enum { | ||
10 | arbiter_all_dmas = 0x3ff, | ||
11 | arbiter_cpu = 0xc00, | ||
12 | arbiter_all_clients = 0x3fff | ||
13 | }; | ||
14 | |||
15 | enum { | ||
16 | arbiter_all_read = 0x55, | ||
17 | arbiter_all_write = 0xaa, | ||
18 | arbiter_all_accesses = 0xff | ||
19 | }; | ||
20 | |||
21 | int crisv32_arbiter_allocate_bandwidth(int client, int region, | ||
22 | unsigned long bandwidth); | ||
23 | int crisv32_arbiter_watch(unsigned long start, unsigned long size, | ||
24 | unsigned long clients, unsigned long accesses, | ||
25 | watch_callback * cb); | ||
26 | int crisv32_arbiter_unwatch(int id); | ||
27 | |||
28 | #endif | ||