Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/ath5k/base.c
	net/8021q/vlan_core.c

1 files changed, 34 insertions, 0 deletions

diff --git a/arch/cris/include/arch-v32/mach-a3/mach/arbiter.h b/arch/cris/include/arch-v32/mach-a3/mach/arbiter.h
new file mode 100644
index 000000000000..65e9d6ff0520
--- /dev/null
+++ b/arch/cris/include/arch-v32/mach-a3/mach/arbiter.h
@@ -0,0 +1,34 @@
+#ifndef _ASM_CRIS_ARCH_ARBITER_H
+#define _ASM_CRIS_ARCH_ARBITER_H
+
+#define EXT_REGION 0
+#define INT_REGION 1
+
+typedef void (watch_callback)(void);
+
+enum {
+        arbiter_all_dmas = 0x7fe,
+        arbiter_cpu = 0x1800,
+        arbiter_all_clients = 0x7fff
+};
+
+enum {
+        arbiter_bar_all_clients = 0x1ff
+};
+
+enum {
+        arbiter_all_read = 0x55,
+        arbiter_all_write = 0xaa,
+        arbiter_all_accesses = 0xff
+};
+
+#define MARB_CLIENTS(foo_cli, bar_cli) (((bar_cli) << 16) | (foo_cli))
+
+int crisv32_arbiter_allocate_bandwidth(int client, int region,
+                unsigned long bandwidth);
+int crisv32_arbiter_watch(unsigned long start, unsigned long size,
+                unsigned long clients, unsigned long accesses,
+                watch_callback * cb);
+int crisv32_arbiter_unwatch(int id);
+
+#endif