[kernel] r5324 - in people/waldi/linux-2.6/debian: arch/hppa arch/hppa/vserver arch/powerpc arch/powerpc/vserver patches patches/series

[Bastian Blank]

Author: waldi
Date: Fri Jan  6 21:25:56 2006
New Revision: 5324

Removed:
   people/waldi/linux-2.6/debian/arch/hppa/vserver/
   people/waldi/linux-2.6/debian/arch/powerpc/vserver/
   people/waldi/linux-2.6/debian/patches/vserver-version.patch
   people/waldi/linux-2.6/debian/patches/vserver-vs2.1.0.2-powerpc.diff
   people/waldi/linux-2.6/debian/patches/vserver-vs2.1.0.2.diff
Modified:
   people/waldi/linux-2.6/debian/arch/hppa/defines
   people/waldi/linux-2.6/debian/arch/powerpc/defines
   people/waldi/linux-2.6/debian/patches/series/2-extra
Log:
Revert r5323.


Modified: people/waldi/linux-2.6/debian/arch/hppa/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/hppa/defines	(original)
+++ people/waldi/linux-2.6/debian/arch/hppa/defines	Fri Jan  6 21:25:56 2006
@@ -1,12 +1,11 @@
 [base]
-#flavours:
-# parisc
-# parisc-smp
-# parisc64
-# parisc64-smp
+flavours:
+ parisc
+ parisc-smp
+ parisc64
+ parisc64-smp
 kernel-arch: parisc
 kernel-header-dirs: parisc
-subarches: vserver
 suggests: palo
 
 [parisc]

Modified: people/waldi/linux-2.6/debian/arch/powerpc/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/powerpc/defines	(original)
+++ people/waldi/linux-2.6/debian/arch/powerpc/defines	Fri Jan  6 21:25:56 2006
@@ -1,14 +1,13 @@
 [base]
-#flavours:
-# apus
-# powerpc
-# powerpc-smp
-# powerpc-miboot
-# powerpc64
+flavours:
+ apus
+ powerpc
+ powerpc-smp
+ powerpc-miboot
+ powerpc64
 kernel-header-dirs: powerpc ppc m68k
 kernel-arch: ppc
 kpkg-subarch: ppc
-subarches: vserver
 
 [apus]
 depends: mkvmlinuz (>= 18)

Modified: people/waldi/linux-2.6/debian/patches/series/2-extra
==============================================================================
--- people/waldi/linux-2.6/debian/patches/series/2-extra	(original)
+++ people/waldi/linux-2.6/debian/patches/series/2-extra	Fri Jan  6 21:25:56 2006
@@ -1,5 +1,2 @@
 + hppa-incompatible.patch hppa
 + m68k-incompatible.patch m68k
-+ vserver-version.patch i386_vserver powerpc_vserver
-+ vserver-vs2.1.0.2.diff powerpc_vserver
-+ vserver-vs2.1.0.2-powerpc.diff powerpc_vserver