[kernel] r11722 - in dists/trunk/linux-2.6/debian/patches: features/all/xen series

[Maximilian Attems]

Author: maks
Date: Sun Jun 29 09:02:06 2008
New Revision: 11722

Log:
xen: fix xectrl patch to apply

trivial Makefile fixup.
seems not too useful as dom0 some steps away, but who knows..

Modified:
   dists/trunk/linux-2.6/debian/patches/features/all/xen/xenctrl.patch
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra

Modified: dists/trunk/linux-2.6/debian/patches/features/all/xen/xenctrl.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/xen/xenctrl.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/features/all/xen/xenctrl.patch	Sun Jun 29 09:02:06 2008
@@ -36,9 +36,9 @@
 index 56592f0..6737463 100644
 --- a/drivers/xen/Makefile
 +++ b/drivers/xen/Makefile
-@@ -1,2 +1,4 @@
- obj-y	+= grant-table.o
- obj-y	+= xenbus/
+@@ -3,2 +3,4 @@
+ obj-$(CONFIG_XEN_XENCOMM)	+= xencomm.o
+ obj-$(CONFIG_XEN_BALLOON)	+= balloon.o
 +
 +obj-$(CONFIG_XENCTRL) += xenctrl/
 diff --git a/drivers/xen/xenctrl/Makefile b/drivers/xen/xenctrl/Makefile

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra	Sun Jun 29 09:02:06 2008
@@ -2,8 +2,8 @@
 + features/all/vserver/bindmount-dev.patch featureset=vserver featureset=xen-vserver
 
 + features/all/xen/vmlinuz-target.patch featureset=xen
-#+ features/all/xen/xenctrl.patch featureset=xen
-#+ features/all/xen/xenctrl-capabilities.patch featureset=xen
-#+ features/all/xen/xenctrl-privcmd.patch featureset=xen
-#+ features/all/xen/xenctrl-xenbus.patch featureset=xen
-#+ features/all/xen/xenctrl-sys-hypervisor.patch featureset=xen
++ features/all/xen/xenctrl.patch featureset=xen
++ features/all/xen/xenctrl-capabilities.patch featureset=xen
++ features/all/xen/xenctrl-privcmd.patch featureset=xen
++ features/all/xen/xenctrl-xenbus.patch featureset=xen
++ features/all/xen/xenctrl-sys-hypervisor.patch featureset=xen