- update

Changed files:
    kernel-alpha-smp.config -> 1.85
    kernel-alpha.config -> 1.85
    kernel-ppc-smp.config -> 1.90
    kernel-ppc.config -> 1.88
    kernel-sparc-smp.config -> 1.59
    kernel-sparc.config -> 1.56
    kernel-sparc64-smp.config -> 1.80

diff --git a/kernel-alpha-smp.config b/kernel-alpha-smp.config
index 5045547d3d524fb0c47d26bba0c6f0a0bb608e8b..c725197f6c7c59371a0f5ad1763547cb31887a34 100644 (file)
--- a/kernel-alpha-smp.config
+++ b/kernel-alpha-smp.config
@@ -602,6 +602,8 @@ CONFIG_WAN_ROUTER=m
 # QoS and/or fair queueing
 #
 CONFIG_NET_SCHED=y
+# CONFIG_NET_SCH_CLK_JIFFIES is not set
+# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
 CONFIG_NET_SCH_CLK_CPU=y
 CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_WRR=m

diff --git a/kernel-alpha.config b/kernel-alpha.config
index f6ce076ff8ae174c7577c6641bcf98b2ec7762b2..7438cf993e3734a70eb97eaa31fc5bc86372f232 100644 (file)
--- a/kernel-alpha.config
+++ b/kernel-alpha.config
@@ -603,6 +603,8 @@ CONFIG_WAN_ROUTER=m
 # QoS and/or fair queueing
 #
 CONFIG_NET_SCHED=y
+# CONFIG_NET_SCH_CLK_JIFFIES is not set
+# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
 CONFIG_NET_SCH_CLK_CPU=y
 CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_WRR=m

diff --git a/kernel-ppc-smp.config b/kernel-ppc-smp.config
index 899521de099ed03bfba17e8228d3a07e526c4a63..6f1302c973e793b909623ea6ba2888a9f864e17a 100644 (file)
--- a/kernel-ppc-smp.config
+++ b/kernel-ppc-smp.config
@@ -650,8 +650,10 @@ CONFIG_WAN_ROUTER=m
 # QoS and/or fair queueing
 #
 CONFIG_NET_SCHED=y
+# CONFIG_NET_SCH_CLK_JIFFIES is not set
+# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
 CONFIG_NET_SCH_CLK_CPU=y
-NET_SCH_CLK_JIFFIES=y
+
 CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_HTB=m
 CONFIG_NET_SCH_HFSC=m

diff --git a/kernel-ppc.config b/kernel-ppc.config
index f94dbf311c0dc89e864ca4400a12792aa1eecdfd..406c6ce0d00e32c7e24a07c3a27863cfc6fb0052 100644 (file)
--- a/kernel-ppc.config
+++ b/kernel-ppc.config
@@ -650,8 +650,10 @@ CONFIG_WAN_ROUTER=m
 # QoS and/or fair queueing
 #
 CONFIG_NET_SCHED=y
+# CONFIG_NET_SCH_CLK_JIFFIES is not set
+# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
 CONFIG_NET_SCH_CLK_CPU=y
-NET_SCH_CLK_JIFFIES=y
+
 CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_HTB=m
 CONFIG_NET_SCH_HFSC=m

diff --git a/kernel-sparc-smp.config b/kernel-sparc-smp.config
index 59d0319111c85395f80a4484c5ed89a6ea902bb9..019fef34edc393d2198627bc5b092ffe43b935ef 100644 (file)
--- a/kernel-sparc-smp.config
+++ b/kernel-sparc-smp.config
@@ -91,6 +91,7 @@ CONFIG_FB_CG14=y
 CONFIG_FB_P9100=y
 CONFIG_FB_LEO=y
 CONFIG_FB_VIRTUAL=m
+CONFIG_FB_MODE_HELPERS=y
 
 #
 # Console display driver support
@@ -122,10 +123,12 @@ CONFIG_LOGO_LINUX_CLUT224=y
 #
 CONFIG_MTD=m
 # CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_PARTITIONS=m
+CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_CONCAT=m
 CONFIG_MTD_REDBOOT_PARTS=m
-CONFIG_MTD_CMDLINE_PARTS=m
+CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+CONFIG_MTD_CMDLINE_PARTS=y
 
 #
 # User Modules And Translation Layers
@@ -161,12 +164,14 @@ CONFIG_MTD_PHYSMAP=m
 CONFIG_MTD_PHYSMAP_START=0x8000000
 CONFIG_MTD_PHYSMAP_LEN=0x4000000
 CONFIG_MTD_PHYSMAP_BUSWIDTH=2
+CONFIG_MTD_PHYSMAP_BANKWIDTH=2
 # CONFIG_MTD_SUN_UFLASH is not set
 
 #
 # Self-contained MTD device drivers
 #
 CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
 CONFIG_MTD_MTDRAM=m
 CONFIG_MTDRAM_TOTAL_SIZE=4096
 CONFIG_MTDRAM_ERASE_SIZE=128
@@ -187,6 +192,11 @@ CONFIG_MTD_DOCPROBE_ADDRESS=0
 #
 CONFIG_MTD_NAND=m
 CONFIG_MTD_NAND_VERIFY_WRITE=y
+CONFIG_MTD_NAND_DISKONCHIP=m
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
+CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
 CONFIG_MTD_NAND_IDS=m
 
 #
@@ -426,6 +436,8 @@ CONFIG_WAN_ROUTER=m
 # QoS and/or fair queueing
 #
 CONFIG_NET_SCHED=y
+# CONFIG_NET_SCH_CLK_JIFFIES is not set
+# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
 CONFIG_NET_SCH_CLK_CPU=y
 CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_WRR=m
@@ -700,6 +712,7 @@ CONFIG_SERIO=y
 CONFIG_SERIO_I8042=y
 CONFIG_SERIO_SERPORT=m
 CONFIG_SERIO_CT82C710=m
+CONFIG_SERIO_RAW=m
 
 #
 # Input Device Drivers
@@ -734,6 +747,7 @@ CONFIG_JOYSTICK_SPACEORB=m
 CONFIG_JOYSTICK_SPACEBALL=m
 CONFIG_JOYSTICK_STINGER=m
 CONFIG_JOYSTICK_TWIDDLER=m
+CONFIG_JOYSTICK_JOYDUMP=m
 CONFIG_INPUT_JOYDUMP=m
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_GUNZE=m
@@ -814,6 +828,8 @@ CONFIG_SUPERMOUNT=m
 CONFIG_SUPERMOUNT_DEBUG=n
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
+CONFIG_SUPERMOUNT=m
+# CONFIG_SUPERMOUNT_DEBUG is not set
 
 #
 # Miscellaneous filesystems
@@ -829,9 +845,17 @@ CONFIG_BFS_FS=m
 CONFIG_EFS_FS=m
 CONFIG_JFFS_FS=m
 CONFIG_JFFS_FS_VERBOSE=0
+# CONFIG_JFFS_PROC_FS is not set
 CONFIG_JFFS2_FS=m
 CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_JFFS2_FS_NAND=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+CONFIG_JFFS2_RUBIN=y
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 CONFIG_VXFS_FS=m
@@ -864,7 +888,7 @@ CONFIG_SMB_FS=m
 CONFIG_SMB_NLS_DEFAULT=y
 CONFIG_SMB_NLS_REMOTE="iso8859-2"
 CONFIG_CIFS=m
-CONFIG_CIFS_STATS=n
+# CONFIG_CIFS_STATS is not set
 CONFIG_CIFS_XATTR=y
 CONFIG_NCP_FS=m
 CONFIG_NCPFS_PACKET_SIGNING=y
@@ -1031,6 +1055,7 @@ CONFIG_SECURITY_CAPABILITIES=m
 CONFIG_SECURITY_SELINUX=y
 # CONFIG_SECURITY_SELINUX_DISABLE is not set
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
 CONFIG_SECURITY_SELINUX_DEVELOP=y
 # CONFIG_SECURITY_SELINUX_MLS is not set
 

diff --git a/kernel-sparc.config b/kernel-sparc.config
index 1b806adce695cd43fad459affc86ff49263653dc..d95ace49a71c1583dfe93e3d494c7821a4cf3787 100644 (file)
--- a/kernel-sparc.config
+++ b/kernel-sparc.config
@@ -90,6 +90,7 @@ CONFIG_FB_CG14=y
 CONFIG_FB_P9100=y
 CONFIG_FB_LEO=y
 CONFIG_FB_VIRTUAL=m
+CONFIG_FB_MODE_HELPERS=y
 
 #
 # Console display driver support
@@ -121,10 +122,12 @@ CONFIG_LOGO_LINUX_CLUT224=y
 #
 CONFIG_MTD=m
 # CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_PARTITIONS=m
+CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_CONCAT=m
 CONFIG_MTD_REDBOOT_PARTS=m
-CONFIG_MTD_CMDLINE_PARTS=m
+CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+CONFIG_MTD_CMDLINE_PARTS=y
 
 #
 # User Modules And Translation Layers
@@ -159,6 +162,7 @@ CONFIG_MTD_ABSENT=m
 CONFIG_MTD_PHYSMAP=m
 CONFIG_MTD_PHYSMAP_START=0x8000000
 CONFIG_MTD_PHYSMAP_LEN=0x4000000
+CONFIG_MTD_PHYSMAP_BANKWIDTH=2
 CONFIG_MTD_PHYSMAP_BUSWIDTH=2
 # CONFIG_MTD_SUN_UFLASH is not set
 
@@ -166,6 +170,7 @@ CONFIG_MTD_PHYSMAP_BUSWIDTH=2
 # Self-contained MTD device drivers
 #
 CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
 CONFIG_MTD_MTDRAM=m
 CONFIG_MTDRAM_TOTAL_SIZE=4096
 CONFIG_MTDRAM_ERASE_SIZE=128
@@ -186,6 +191,11 @@ CONFIG_MTD_DOCPROBE_ADDRESS=0
 #
 CONFIG_MTD_NAND=m
 CONFIG_MTD_NAND_VERIFY_WRITE=y
+CONFIG_MTD_NAND_DISKONCHIP=m
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
+CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
 CONFIG_MTD_NAND_IDS=m
 
 #
@@ -425,13 +435,18 @@ CONFIG_WAN_ROUTER=m
 # QoS and/or fair queueing
 #
 CONFIG_NET_SCHED=y
+# CONFIG_NET_SCH_CLK_JIFFIES is not set
+# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
+CONFIG_NET_SCH_CLK_CPU=y
 CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_WRR=m
 CONFIG_NET_SCH_HTB=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_ATM=m
 CONFIG_NET_SCH_PRIO=m
 CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_ESFQ=m
 CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_SCH_TBF=m
 CONFIG_NET_SCH_GRED=m
@@ -697,6 +712,7 @@ CONFIG_SERIO=y
 CONFIG_SERIO_I8042=y
 CONFIG_SERIO_SERPORT=m
 CONFIG_SERIO_CT82C710=m
+CONFIG_SERIO_RAW=m
 
 #
 # Input Device Drivers
@@ -731,6 +747,7 @@ CONFIG_JOYSTICK_SPACEORB=m
 CONFIG_JOYSTICK_SPACEBALL=m
 CONFIG_JOYSTICK_STINGER=m
 CONFIG_JOYSTICK_TWIDDLER=m
+CONFIG_JOYSTICK_JOYDUMP=m
 CONFIG_INPUT_JOYDUMP=m
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_GUNZE=m
@@ -809,6 +826,8 @@ CONFIG_PROC_KCORE=y
 CONFIG_TMPFS=y
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
+CONFIG_SUPERMOUNT=m
+# CONFIG_SUPERMOUNT_DEBUG is not set
 
 #
 # Miscellaneous filesystems
@@ -824,9 +843,17 @@ CONFIG_BFS_FS=m
 CONFIG_EFS_FS=m
 CONFIG_JFFS_FS=m
 CONFIG_JFFS_FS_VERBOSE=0
+# CONFIG_JFFS_PROC_FS is not set
 CONFIG_JFFS2_FS=m
 CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_JFFS2_FS_NAND=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+CONFIG_JFFS2_RUBIN=y
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 CONFIG_VXFS_FS=m
@@ -859,7 +886,7 @@ CONFIG_SMB_FS=m
 CONFIG_SMB_NLS_DEFAULT=y
 CONFIG_SMB_NLS_REMOTE="iso8859-2"
 CONFIG_CIFS=m
-CONFIG_CIFS_STATS=n
+# CONFIG_CIFS_STATS is not set
 CONFIG_CIFS_XATTR=y
 CONFIG_NCP_FS=m
 CONFIG_NCPFS_PACKET_SIGNING=y
@@ -1026,6 +1053,7 @@ CONFIG_SECURITY_CAPABILITIES=m
 CONFIG_SECURITY_SELINUX=y
 # CONFIG_SECURITY_SELINUX_DISABLE is not set
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
 CONFIG_SECURITY_SELINUX_DEVELOP=y
 # CONFIG_SECURITY_SELINUX_MLS is not set
 
@@ -1049,6 +1077,7 @@ CONFIG_CRYPTO_AES=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_KHAZAD=m
 CONFIG_CRYPTO_DEFLATE=m
 # CONFIG_CRYPTO_TEST is not set
 

diff --git a/kernel-sparc64-smp.config b/kernel-sparc64-smp.config
index f37a047a775c5c2c6be432d3119a7dd1fad5120d..f1b5d7bd0c9447963798e0cf30a826659b171154 100644 (file)
--- a/kernel-sparc64-smp.config
+++ b/kernel-sparc64-smp.config
@@ -545,9 +545,9 @@ CONFIG_NET_DIVERT=y
 # QoS and/or fair queueing
 #
 CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_CLK_JIFFIES=y
+# CONFIG_NET_SCH_CLK_JIFFIES is not set
 # CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
-# CONFIG_NET_SCH_CLK_CPU is not set
+CONFIG_NET_SCH_CLK_CPU=y
 CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_HTB=m
 CONFIG_NET_SCH_WRR=m