[kernel] r5564 - in people/waldi/linux-2.6: . debian/arch debian/arch/i386 debian/arch/powerpc debian/patches/series

[Bastian Blank]

Author: waldi
Date: Sun Jan 22 18:32:32 2006
New Revision: 5564

Modified:
   people/waldi/linux-2.6/   (props changed)
   people/waldi/linux-2.6/debian/arch/config
   people/waldi/linux-2.6/debian/arch/i386/config.486
   people/waldi/linux-2.6/debian/arch/i386/config.686
   people/waldi/linux-2.6/debian/arch/i386/config.k7
   people/waldi/linux-2.6/debian/arch/powerpc/config.apus
   people/waldi/linux-2.6/debian/arch/powerpc/config.powerpc
   people/waldi/linux-2.6/debian/arch/powerpc/config.powerpc-miboot
   people/waldi/linux-2.6/debian/arch/powerpc/config.powerpc64
   people/waldi/linux-2.6/debian/patches/series/0experimental.1-extra
Log:
Merge /dists/trunk/linux-2.6.


Modified: people/waldi/linux-2.6/debian/arch/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/config	(original)
+++ people/waldi/linux-2.6/debian/arch/config	Sun Jan 22 18:32:32 2006
@@ -816,5 +816,4 @@
 # CONFIG_DEBUG_MUTEXES is not set
 CONFIG_MTD_DATAFLASH=m
 # CONFIG_FORCED_INLINING is not set
-# CONFIG_BROKEN is not set
-# CONFIG_BROKEN_ON_SMP is not set
+CONFIG_CLEAN_COMPILE=y

Modified: people/waldi/linux-2.6/debian/arch/i386/config.486
==============================================================================
--- people/waldi/linux-2.6/debian/arch/i386/config.486	(original)
+++ people/waldi/linux-2.6/debian/arch/i386/config.486	Sun Jan 22 18:32:32 2006
@@ -110,4 +110,3 @@
 CONFIG_X86_ALIGNMENT_16=y
 CONFIG_X86_INVLPG=y
 CONFIG_X86_WP_WORKS_OK=y
-CONFIG_BROKEN_ON_SMP=y

Modified: people/waldi/linux-2.6/debian/arch/i386/config.686
==============================================================================
--- people/waldi/linux-2.6/debian/arch/i386/config.686	(original)
+++ people/waldi/linux-2.6/debian/arch/i386/config.686	Sun Jan 22 18:32:32 2006
@@ -84,4 +84,3 @@
 # CONFIG_DEBUG_HIGHMEM is not set
 CONFIG_X86_CMPXCHG64=y
 # CONFIG_M486 is not set
-CONFIG_BROKEN_ON_SMP=y

Modified: people/waldi/linux-2.6/debian/arch/i386/config.k7
==============================================================================
--- people/waldi/linux-2.6/debian/arch/i386/config.k7	(original)
+++ people/waldi/linux-2.6/debian/arch/i386/config.k7	Sun Jan 22 18:32:32 2006
@@ -85,4 +85,3 @@
 # CONFIG_DEBUG_HIGHMEM is not set
 CONFIG_X86_CMPXCHG64=y
 # CONFIG_M486 is not set
-CONFIG_BROKEN_ON_SMP=y

Modified: people/waldi/linux-2.6/debian/arch/powerpc/config.apus
==============================================================================
--- people/waldi/linux-2.6/debian/arch/powerpc/config.apus	(original)
+++ people/waldi/linux-2.6/debian/arch/powerpc/config.apus	Sun Jan 22 18:32:32 2006
@@ -18,7 +18,6 @@
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_CLEAN_COMPILE=y
-CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 
 #

Modified: people/waldi/linux-2.6/debian/arch/powerpc/config.powerpc
==============================================================================
--- people/waldi/linux-2.6/debian/arch/powerpc/config.powerpc	(original)
+++ people/waldi/linux-2.6/debian/arch/powerpc/config.powerpc	Sun Jan 22 18:32:32 2006
@@ -1,6 +1,5 @@
 # CONFIG_APUS is not set
 CONFIG_PPC32=y
-CONFIG_BROKEN_ON_SMP=y
 # CONFIG_SMP is not set
 CONFIG_PM_STD_PARTITION=""
 # CONFIG_IRPORT_SIR is not set

Modified: people/waldi/linux-2.6/debian/arch/powerpc/config.powerpc-miboot
==============================================================================
--- people/waldi/linux-2.6/debian/arch/powerpc/config.powerpc-miboot	(original)
+++ people/waldi/linux-2.6/debian/arch/powerpc/config.powerpc-miboot	Sun Jan 22 18:32:32 2006
@@ -68,7 +68,6 @@
 # CONFIG_IRPORT_SIR is not set
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
 # CONFIG_PMAC_BACKLIGHT is not set
-CONFIG_BROKEN_ON_SMP=y
 CONFIG_CRYPTO_MD5=y
 # CONFIG_SOFTWARE_SUSPEND is not set
 CONFIG_DEFAULT_DEADLINE=y

Modified: people/waldi/linux-2.6/debian/arch/powerpc/config.powerpc64
==============================================================================
--- people/waldi/linux-2.6/debian/arch/powerpc/config.powerpc64	(original)
+++ people/waldi/linux-2.6/debian/arch/powerpc/config.powerpc64	Sun Jan 22 18:32:32 2006
@@ -30,7 +30,6 @@
 CONFIG_LOCK_KERNEL=y
 CONFIG_LPARCFG=m
 CONFIG_MEGARAID_LEGACY=m
-CONFIG_MPIC_BROKEN_U3=y
 CONFIG_NR_CPUS=32
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_SELECT_MEMORY_MODEL=y

Modified: people/waldi/linux-2.6/debian/patches/series/0experimental.1-extra
==============================================================================
--- people/waldi/linux-2.6/debian/patches/series/0experimental.1-extra	(original)
+++ people/waldi/linux-2.6/debian/patches/series/0experimental.1-extra	Sun Jan 22 18:32:32 2006
@@ -1,4 +1,4 @@
-+ hppa-incompatible.patch hppa
-+ m68k-incompatible.patch m68k
-+ maclist.patch arm
-+ arm-nslu2-maclist.patch arm
+#+ hppa-incompatible.patch hppa
+#+ m68k-incompatible.patch m68k
+#+ maclist.patch arm
+#+ arm-nslu2-maclist.patch arm