From 62f2d13b4981c126cce6175e19e0c438d40850db Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sat, 2 Dec 2006 11:05:09 +0000 Subject: [PATCH] Revert r7900, changes the ABI. svn path=/dists/sid/linux-2.6/; revision=7902 --- debian/arch/_xen/config | 2 +- debian/changelog | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/arch/_xen/config b/debian/arch/_xen/config index 55fb6c79e..bab0e3cfa 100644 --- a/debian/arch/_xen/config +++ b/debian/arch/_xen/config @@ -17,7 +17,7 @@ CONFIG_XEN_PCIDEV_BACKEND_VPCI=y CONFIG_XEN_BLKDEV_FRONTEND=y CONFIG_XEN_NETDEV_FRONTEND=y CONFIG_XEN_SCRUB_PAGES=y -# CONFIG_XEN_DISABLE_SERIAL is not set +CONFIG_XEN_DISABLE_SERIAL=y CONFIG_XEN_SYSFS=y CONFIG_XEN_COMPAT_030002_AND_LATER=y # CONFIG_XEN_COMPAT_LATEST_ONLY is not set diff --git a/debian/changelog b/debian/changelog index 3d0204215..e9ba838e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,6 @@ linux-2.6 (2.6.18-7) UNRELEASED; urgency=low [ Bastian Blank ] * Emit conflict lines for initramfs generators. (closes: #400305) * Update vserver patch to 2.0.2.2-rc8. - * xen: Don't disable serial drivers. * s390: Add patch to fix posix types. [ Martin Michlmayr ]