diff -NurpP --minimal linux-2.6.19-vs2.1.x-t7/include/linux/vserver/device.h linux-2.6.19-vs2.1.x-t7.1/include/linux/vserver/device.h
--- linux-2.6.19-vs2.1.x-t7/include/linux/vserver/device.h	1970-01-01 01:00:00 +0100
+++ linux-2.6.19-vs2.1.x-t7.1/include/linux/vserver/device.h	2006-12-08 01:36:02 +0100
@@ -0,0 +1,13 @@
+#ifndef _VX_DEVICE_H
+#define _VX_DEVICE_H
+
+
+#define DATTR_CREATE	0x00000001
+#define DATTR_OPEN	0x00000002
+
+#define DATTR_REMAP	0x00000010
+
+
+#else	/* _VX_DEVICE_H */
+#warning duplicate inclusion
+#endif	/* _VX_DEVICE_H */
diff -NurpP --minimal linux-2.6.19-vs2.1.x-t7/include/linux/vserver/device_cmd.h linux-2.6.19-vs2.1.x-t7.1/include/linux/vserver/device_cmd.h
--- linux-2.6.19-vs2.1.x-t7/include/linux/vserver/device_cmd.h	1970-01-01 01:00:00 +0100
+++ linux-2.6.19-vs2.1.x-t7.1/include/linux/vserver/device_cmd.h	2006-12-08 01:24:53 +0100
@@ -0,0 +1,42 @@
+#ifndef _VX_DEVICE_CMD_H
+#define _VX_DEVICE_CMD_H
+
+
+/*  device vserver commands */
+
+#define VCMD_set_mapping	VC_CMD(DEVICE, 1, 0)
+
+struct	vcmd_set_mapping_v0 {
+	const char __user *device;
+	const char __user *target;
+	uint32_t flags;
+	uint32_t mask;
+};
+
+
+#ifdef	__KERNEL__
+
+#ifdef	CONFIG_COMPAT
+
+#include <asm/compat.h>
+
+struct	vcmd_set_mapping_v0_x32 {
+	compat_uptr_t device_ptr;
+	compat_uptr_t target_ptr;
+	uint32_t flags;
+};
+
+#endif	/* CONFIG_COMPAT */
+
+#include <linux/compiler.h>
+
+extern int vc_set_mapping(uint32_t, void __user *);
+
+#ifdef	CONFIG_COMPAT
+
+extern int vc_set_mapping_x32(uint32_t, void __user *);
+
+#endif	/* CONFIG_COMPAT */
+
+#endif	/* __KERNEL__ */
+#endif	/* _VX_DEVICE_CMD_H */
diff -NurpP --minimal linux-2.6.19-vs2.1.x-t7/include/linux/vserver/switch.h linux-2.6.19-vs2.1.x-t7.1/include/linux/vserver/switch.h
--- linux-2.6.19-vs2.1.x-t7/include/linux/vserver/switch.h	2006-11-08 04:57:42 +0100
+++ linux-2.6.19-vs2.1.x-t7.1/include/linux/vserver/switch.h	2006-12-08 01:19:45 +0100
@@ -19,7 +19,7 @@
 	 |STATS  |DESTROY|ALTER  |CHANGE |LIMIT  |TEST   | |       |       |
 	 |INFO   |SETUP  |       |MOVE   |       |       | |       |       |
   -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
-  SYSTEM |VERSION|VSETUP |VHOST  |       |       |       | |DEVICES|       |
+  SYSTEM |VERSION|VSETUP |VHOST  |       |       |       | |DEVICE |       |
   HOST   |     00|     01|     02|     03|     04|     05| |     06|     07|
   -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
   CPU    |       |VPROC  |PROCALT|PROCMIG|PROCTRL|       | |SCHED. |       |
@@ -51,6 +51,8 @@
 #define VC_CAT_VSETUP		1
 #define VC_CAT_VHOST		2
 
+#define VC_CAT_DEVICE		6
+
 #define VC_CAT_VPROC		9
 #define VC_CAT_PROCALT		10
 #define VC_CAT_PROCMIG		11