[kernel] r5119 - in dists/trunk/linux-2.6/debian/arch: arm hppa m68k

Jonas Smedegaard js at costa.debian.org
Thu Dec 29 02:25:43 UTC 2005 

Author: js
Date: Thu Dec 29 02:25:41 2005
New Revision: 5119

Modified:
   dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
   dists/trunk/linux-2.6/debian/arch/hppa/config.parisc-smp
   dists/trunk/linux-2.6/debian/arch/hppa/config.parisc64-smp
   dists/trunk/linux-2.6/debian/arch/m68k/config.amiga
   dists/trunk/linux-2.6/debian/arch/m68k/config.atari
   dists/trunk/linux-2.6/debian/arch/m68k/config.bvme6000
   dists/trunk/linux-2.6/debian/arch/m68k/config.hp
   dists/trunk/linux-2.6/debian/arch/m68k/config.mac
   dists/trunk/linux-2.6/debian/arch/m68k/config.mvme147
   dists/trunk/linux-2.6/debian/arch/m68k/config.mvme16x
   dists/trunk/linux-2.6/debian/arch/m68k/config.q40
   dists/trunk/linux-2.6/debian/arch/m68k/config.sun3
Log:
Some more kernel config duplicates stripped.

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx	Thu Dec 29 02:25:41 2005
@@ -240,7 +240,6 @@
 CONFIG_NET_CLS=y
 # CONFIG_NET_CLS_BASIC is not set
 CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
 CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
 # CONFIG_CLS_U32_PERF is not set

Modified: dists/trunk/linux-2.6/debian/arch/hppa/config.parisc-smp
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/hppa/config.parisc-smp	(original)
+++ dists/trunk/linux-2.6/debian/arch/hppa/config.parisc-smp	Thu Dec 29 02:25:41 2005
@@ -5,7 +5,6 @@
 # CONFIG_PA8X00 is not set
 CONFIG_PA11=y
 CONFIG_SMP=y
-CONFIG_HOTPLUG_CPU=y
 # CONFIG_HPUX is not set
 CONFIG_NR_CPUS=32
 # CONFIG_SCSI_DPT_I2O is not set

Modified: dists/trunk/linux-2.6/debian/arch/hppa/config.parisc64-smp
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/hppa/config.parisc64-smp	(original)
+++ dists/trunk/linux-2.6/debian/arch/hppa/config.parisc64-smp	Thu Dec 29 02:25:41 2005
@@ -7,7 +7,6 @@
 CONFIG_PREFETCH=y
 CONFIG_64BIT=y
 CONFIG_SMP=y
-CONFIG_HOTPLUG_CPU=y
 CONFIG_DISCONTIGMEM=y
 CONFIG_COMPAT=y
 CONFIG_NR_CPUS=32

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.amiga
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.amiga	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.amiga	Thu Dec 29 02:25:41 2005
@@ -13,7 +13,6 @@
 CONFIG_M68030=y
 CONFIG_M68040=y
 CONFIG_M68060=y
-CONFIG_MMU_MOTOROLA=y
 CONFIG_M68KFPU_EMU=y
 CONFIG_M68KFPU_EMU_EXTRAPREC=y
 # CONFIG_M68KFPU_EMU_ONLY is not set
@@ -88,14 +87,9 @@
 CONFIG_HYDRA=m
 CONFIG_ZORRO8390=m
 CONFIG_APNE=m
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NET_VENDOR_SMC is not set
-# CONFIG_NET_VENDOR_RACAL is not set
 # CONFIG_AT1700 is not set
 # CONFIG_DEPCA is not set
 # CONFIG_HP100 is not set
-# CONFIG_NET_ISA is not set
-# CONFIG_NET_PCI is not set
 # CONFIG_TR is not set
 CONFIG_PLIP=m
 CONFIG_PPP_FILTER=y
@@ -185,7 +179,6 @@
 CONFIG_HFSPLUS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 CONFIG_NFS_V4=y
-CONFIG_NFSD_V4=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_NCPFS_NFS_NS=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.atari
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.atari	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.atari	Thu Dec 29 02:25:41 2005
@@ -12,7 +12,6 @@
 CONFIG_M68030=y
 CONFIG_M68040=y
 CONFIG_M68060=y
-CONFIG_MMU_MOTOROLA=y
 CONFIG_M68KFPU_EMU=y
 CONFIG_M68KFPU_EMU_EXTRAPREC=y
 # CONFIG_M68KFPU_EMU_ONLY is not set
@@ -96,7 +95,6 @@
 CONFIG_HFSPLUS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 # CONFIG_NFS_V4 is not set
-# CONFIG_NFSD_V4 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 CONFIG_NCPFS_NFS_NS=y
 CONFIG_NCPFS_OS2_NS=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.bvme6000
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.bvme6000	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.bvme6000	Thu Dec 29 02:25:41 2005
@@ -16,7 +16,6 @@
 # CONFIG_M68030 is not set
 CONFIG_M68040=y
 CONFIG_M68060=y
-CONFIG_MMU_MOTOROLA=y
 # CONFIG_M68KFPU_EMU is not set
 # CONFIG_PARPORT is not set
 # CONFIG_IDE is not set
@@ -56,7 +55,6 @@
 CONFIG_HFSPLUS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 CONFIG_NFS_V4=y
-CONFIG_NFSD_V4=y
 CONFIG_ROOT_NFS=y
 CONFIG_SUNRPC_GSS=y
 CONFIG_RPCSEC_GSS_KRB5=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.hp
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.hp	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.hp	Thu Dec 29 02:25:41 2005
@@ -13,7 +13,6 @@
 CONFIG_M68030=y
 CONFIG_M68040=y
 CONFIG_M68060=y
-CONFIG_MMU_MOTOROLA=y
 CONFIG_M68KFPU_EMU=y
 CONFIG_M68KFPU_EMU_EXTRAPREC=y
 # CONFIG_M68KFPU_EMU_ONLY is not set
@@ -52,7 +51,6 @@
 CONFIG_HFSPLUS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 CONFIG_NFS_V4=y
-CONFIG_NFSD_V4=y
 CONFIG_ROOT_NFS=y
 CONFIG_SUNRPC_GSS=y
 CONFIG_RPCSEC_GSS_KRB5=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.mac
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.mac	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.mac	Thu Dec 29 02:25:41 2005
@@ -14,7 +14,6 @@
 CONFIG_M68030=y
 CONFIG_M68040=y
 # CONFIG_M68060 is not set
-CONFIG_MMU_MOTOROLA=y
 CONFIG_M68KFPU_EMU=y
 CONFIG_M68KFPU_EMU_EXTRAPREC=y
 # CONFIG_M68KFPU_EMU_ONLY is not set
@@ -55,7 +54,6 @@
 CONFIG_MAC89x0=y
 CONFIG_MACSONIC=n # does not compile at the moment
 CONFIG_MACMACE=y
-# CONFIG_NET_VENDOR_SMC is not set
 CONFIG_PPP_FILTER=y
 # CONFIG_PPP_ASYNC is not set
 # CONFIG_PPP_SYNC_TTY is not set
@@ -100,7 +98,6 @@
 CONFIG_HFSPLUS_FS=y
 # CONFIG_UFS_FS_WRITE is not set
 CONFIG_NFS_V4=y
-CONFIG_NFSD_V4=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_NCPFS_NFS_NS=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.mvme147
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.mvme147	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.mvme147	Thu Dec 29 02:25:41 2005
@@ -15,7 +15,6 @@
 CONFIG_M68030=y
 # CONFIG_M68040 is not set
 # CONFIG_M68060 is not set
-CONFIG_MMU_MOTOROLA=y
 # CONFIG_M68KFPU_EMU is not set
 # CONFIG_PARPORT is not set
 # CONFIG_IDE is not set
@@ -65,7 +64,6 @@
 CONFIG_HFSPLUS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 CONFIG_NFS_V4=y
-CONFIG_NFSD_V4=y
 CONFIG_ROOT_NFS=y
 CONFIG_SUNRPC_GSS=y
 CONFIG_RPCSEC_GSS_KRB5=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.mvme16x
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.mvme16x	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.mvme16x	Thu Dec 29 02:25:41 2005
@@ -16,7 +16,6 @@
 # CONFIG_M68030 is not set
 CONFIG_M68040=y
 CONFIG_M68060=y
-CONFIG_MMU_MOTOROLA=y
 # CONFIG_M68KFPU_EMU is not set
 # CONFIG_PARPORT is not set
 # CONFIG_IDE is not set
@@ -70,7 +69,6 @@
 CONFIG_HFSPLUS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 CONFIG_NFS_V4=y
-CONFIG_NFSD_V4=y
 CONFIG_ROOT_NFS=y
 CONFIG_SUNRPC_GSS=y
 CONFIG_RPCSEC_GSS_KRB5=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.q40
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.q40	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.q40	Thu Dec 29 02:25:41 2005
@@ -12,7 +12,6 @@
 # CONFIG_M68030 is not set
 CONFIG_M68040=y
 CONFIG_M68060=y
-CONFIG_MMU_MOTOROLA=y
 CONFIG_M68KFPU_EMU=y
 CONFIG_M68KFPU_EMU_EXTRAPREC=y
 # CONFIG_M68KFPU_EMU_ONLY is not set
@@ -57,15 +56,10 @@
 # CONFIG_IPX_INTERN is not set
 # CONFIG_DEV_APPLETALK is not set
 # CONFIG_ARCNET is not set
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NET_VENDOR_SMC is not set
-# CONFIG_NET_VENDOR_RACAL is not set
 # CONFIG_AT1700 is not set
 # CONFIG_DEPCA is not set
 # CONFIG_HP100 is not set
-# CONFIG_NET_ISA is not set
 CONFIG_NE2000=m
-# CONFIG_NET_PCI is not set
 # CONFIG_TR is not set
 CONFIG_PPP_FILTER=y
 CONFIG_PPP_ASYNC=m
@@ -110,7 +104,6 @@
 CONFIG_HFSPLUS_FS=m
 CONFIG_UFS_FS_WRITE=y
 CONFIG_NFS_V4=y
-CONFIG_NFSD_V4=y
 CONFIG_ROOT_NFS=y
 CONFIG_SUNRPC_GSS=y
 CONFIG_RPCSEC_GSS_KRB5=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.sun3
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.sun3	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.sun3	Thu Dec 29 02:25:41 2005
@@ -1,7 +1,6 @@
 CONFIG_CLEAN_COMPILE=y
 CONFIG_SUN3=y
 CONFIG_M68020=y
-CONFIG_MMU_SUN3=y
 CONFIG_M68KFPU_EMU=y
 CONFIG_M68KFPU_EMU_EXTRAPREC=y
 # CONFIG_M68KFPU_EMU_ONLY is not set
@@ -51,7 +50,6 @@
 CONFIG_HFSPLUS_FS=m
 CONFIG_UFS_FS_WRITE=y
 CONFIG_NFS_V4=y
-CONFIG_NFSD_V4=y
 CONFIG_ROOT_NFS=y
 CONFIG_SUNRPC_GSS=y
 CONFIG_RPCSEC_GSS_KRB5=y

More information about the Kernel-svn-changes mailing list