* debian/arch/amd64/defines, debian/arch/i386/defines,

debian/arch/powerpc/defines: Temporarily disable vserver.
* debian/patches/series/0experimental.1: Remove merged patch.
* debian/patches/arm-nslu2-beeper.patch: Remove.

svn path=/dists/trunk/linux-2.6/; revision=5975

debian/arch/amd64/defines

@@ -8,7 +8,7 @@ flavours:
  em64t-p4-smp
 kernel-arch: x86_64
 kernel-header-dirs: x86_64
-subarches: vserver
+#subarches: vserver
 suggests: grub | lilo (>= 19.1)
 
 [amd64-generic]

debian/arch/i386/defines

@@ -8,7 +8,7 @@ flavours:
  k7-smp
 kernel-arch: i386
 kernel-header-dirs: i386
-subarches: vserver
+#subarches: vserver
 suggests: grub | lilo (>= 19.1)
 
 [686]

debian/arch/powerpc/defines

@@ -8,7 +8,7 @@ flavours:
 kernel-header-dirs: powerpc ppc m68k
 kernel-arch: powerpc
 kpkg-subarch: ppc
-subarches: vserver
+#subarches: vserver
 
 [apus]
 depends: initramfs-tools | yaird | linux-initramfs-tool, mkvmlinuz (>= 18)

debian/patches/arm-nslu2-beeper.patch

@@ -1,34 +0,0 @@
-# DP: arm/mach-ixp4xx portion of the beeper support for the NSLU2.
-
-# Is in Linus' git, will be in 2.6.16
-
-Beeper support for the NSLU2.
-
-Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
-
- arch/arm/mach-ixp4xx/nslu2-setup.c |    7 +
-
---- linux-nslu2.orig/arch/arm/mach-ixp4xx/nslu2-setup.c	2006-01-23 02:13:55.000000000 +0100
-+++ linux-nslu2/arch/arm/mach-ixp4xx/nslu2-setup.c	2006-01-25 11:32:14.000000000 +0100
-@@ -52,6 +52,12 @@ static struct platform_device nslu2_i2c_
- 	.num_resources		= 0,
- };
- 
-+static struct platform_device nslu2_beeper = {
-+	.name			= "ixp4xx-beeper",
-+	.id			= NSLU2_GPIO_BUZZ,
-+	.num_resources		= 0,
-+};
-+
- static struct resource nslu2_uart_resources[] = {
- 	{
- 		.start		= IXP4XX_UART1_BASE_PHYS,
-@@ -99,6 +105,7 @@ static struct platform_device *nslu2_dev
- 	&nslu2_i2c_controller,
- 	&nslu2_flash,
- 	&nslu2_uart,
-+	&nslu2_beeper,
- };
- 
- static void nslu2_power_off(void)
-

debian/patches/series/0experimental.1

@@ -15,4 +15,3 @@
 #FIXME + powerpc-apus.patch
 + sparc64-hme-lockup.patch
 + sparc64-atyfb-xl-gr.patch
-#FIXME + arm-nslu2-beeper.patch