2001-04-19 17:20:17

by Eric S. Raymond

[permalink] [raw]
Subject: Dead symbol elimination, stage 1

The following patch cleans dead symbols out of the defconfigs in the 2.4.4pre4
source tree. It corrects a typo involving CONFIG_GEN_RTC. Another typo
involving CONFIG_SOUND_YMPCI doesn't need to be corrected, as the symbol
is never set in these files.

This completely eliminates one class of dead symbol, that discovered by

kxref.py -f "d&~(c|h|o|m)"

That's 82 broken symbols, so it's a substantial whack.

--- arch/parisc/defconfig Tue Dec 5 15:29:39 2000
+++ arch/parisc/defconfig Thu Apr 19 11:03:09 2001
@@ -255,7 +255,7 @@
# Watchdog Cards
#
# CONFIG_WATCHDOG is not set
-CONFIG_GENRTC=y
+CONFIG_GEN_RTC=y
# CONFIG_INTEL_RNG is not set
# CONFIG_NVRAM is not set
# CONFIG_RTC is not set
--- arch/alpha/defconfig Sun Mar 4 17:30:18 2001
+++ arch/alpha/defconfig.tweaked Thu Apr 19 12:23:56 2001
@@ -378,7 +378,6 @@
# CONFIG_NE2K_PCI is not set
# CONFIG_NE3210 is not set
# CONFIG_ES3210 is not set
-# CONFIG_RTL8129 is not set
# CONFIG_8139TOO is not set
# CONFIG_SIS900 is not set
# CONFIG_EPIC100 is not set
--- arch/arm/def-configs/a5k Mon Nov 27 20:07:59 2000
+++ arch/arm/def-configs/a5k.tweaked Thu Apr 19 12:23:56 2001
@@ -527,7 +527,6 @@
#
# Kernel hacking
#
-CONFIG_FRAME_POINTER=y
CONFIG_DEBUG_ERRORS=y
CONFIG_DEBUG_USER=y
# CONFIG_DEBUG_INFO is not set
--- arch/arm/def-configs/assabet Mon Nov 27 20:07:59 2000
+++ arch/arm/def-configs/assabet.tweaked Thu Apr 19 12:23:56 2001
@@ -54,8 +54,6 @@
# CONFIG_SA1100_XP860 is not set
# CONFIG_SA1100_PANGOLIN is not set
CONFIG_ANGELBOOT=y
-CONFIG_SA1100_FREQUENCY_SCALE=y
-# CONFIG_SA1100_VOLTAGE_SCALE is not set
# CONFIG_ARCH_ACORN is not set
# CONFIG_FOOTBRIDGE is not set
# CONFIG_FOOTBRIDGE_HOST is not set
@@ -83,8 +81,6 @@
# PCMCIA/CardBus support
#
CONFIG_PCMCIA=y
-# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_SA1100_PCMCIA=y
CONFIG_VIRTUAL_BUS=y
CONFIG_NET=y
CONFIG_SYSVIPC=y
@@ -338,8 +334,6 @@
CONFIG_SERIAL_SA1100=y
CONFIG_SERIAL_SA1100_CONSOLE=y
CONFIG_SA1100_DEFAULT_BAUDRATE=9600
-CONFIG_TOUCHSCREEN_UCB1200=y
-# CONFIG_TOUCHSCREEN_BITSY is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=32

@@ -381,7 +375,6 @@
# CONFIG_FTAPE is not set
# CONFIG_AGP is not set
# CONFIG_DRM is not set
-# CONFIG_PCMCIA_SERIAL is not set

#
# File systems
@@ -517,7 +510,6 @@
CONFIG_DUMMY_CONSOLE=y
# CONFIG_FB_CYBER2000 is not set
CONFIG_FB_SA1100=y
-# CONFIG_FB_MQ200 is not set
# CONFIG_FB_VIRTUAL is not set
# CONFIG_FBCON_ADVANCED is not set
CONFIG_FBCON_CFB2=y
@@ -536,8 +528,6 @@
# Sound
#
CONFIG_SOUND=y
-CONFIG_SOUND_UDA1341=y
-# CONFIG_SOUND_SA1100_SSP is not set
# CONFIG_SOUND_CMPCI is not set
# CONFIG_SOUND_EMU10K1 is not set
# CONFIG_SOUND_FUSION is not set
@@ -561,7 +551,6 @@
#
# Kernel hacking
#
-CONFIG_FRAME_POINTER=y
CONFIG_DEBUG_ERRORS=y
CONFIG_DEBUG_USER=y
# CONFIG_DEBUG_INFO is not set
--- arch/arm/def-configs/brutus Mon Nov 27 20:07:59 2000
+++ arch/arm/def-configs/brutus.tweaked Thu Apr 19 12:23:56 2001
@@ -37,14 +37,11 @@
# CONFIG_SA1100_CERF is not set
# CONFIG_SA1100_BITSY is not set
# CONFIG_SA1100_LART is not set
-# CONFIG_SA1100_THINCLIENT is not set
# CONFIG_SA1100_GRAPHICSCLIENT is not set
# CONFIG_SA1100_NANOENGINE is not set
# CONFIG_SA1100_VICTOR is not set
# CONFIG_SA1100_XP860 is not set
CONFIG_ANGELBOOT=y
-# CONFIG_SA1100_FREQUENCY_SCALE is not set
-# CONFIG_SA1100_VOLTAGE_SCALE is not set
# CONFIG_ARCH_ACORN is not set
# CONFIG_FOOTBRIDGE is not set
# CONFIG_FOOTBRIDGE_HOST is not set
@@ -151,8 +148,6 @@
# CONFIG_VT_CONSOLE is not set
CONFIG_SERIAL_SA1100=y
CONFIG_SERIAL_SA1100_CONSOLE=y
-# CONFIG_TOUCHSCREEN_UCB1200 is not set
-# CONFIG_TOUCHSCREEN_BITSY is not set
# CONFIG_SERIAL is not set
# CONFIG_SERIAL_EXTENDED is not set
# CONFIG_SERIAL_NONSTANDARD is not set
@@ -288,7 +283,6 @@
#
# Kernel hacking
#
-CONFIG_FRAME_POINTER=y
CONFIG_DEBUG_ERRORS=y
CONFIG_DEBUG_USER=y
CONFIG_DEBUG_INFO=y
--- arch/arm/def-configs/cerf Mon Nov 27 20:07:59 2000
+++ arch/arm/def-configs/cerf.tweaked Thu Apr 19 12:23:56 2001
@@ -35,17 +35,13 @@
# CONFIG_SA1100_ASSABET is not set
# CONFIG_SA1100_BRUTUS is not set
CONFIG_SA1100_CERF=y
-CONFIG_SA1100_CERF_32MB=y
# CONFIG_SA1100_BITSY is not set
# CONFIG_SA1100_LART is not set
-# CONFIG_SA1100_THINCLIENT is not set
# CONFIG_SA1100_GRAPHICSCLIENT is not set
# CONFIG_SA1100_NANOENGINE is not set
# CONFIG_SA1100_VICTOR is not set
# CONFIG_SA1100_XP860 is not set
# CONFIG_ANGELBOOT is not set
-# CONFIG_SA1100_FREQUENCY_SCALE is not set
-# CONFIG_SA1100_VOLTAGE_SCALE is not set
# CONFIG_ARCH_ACORN is not set
# CONFIG_FOOTBRIDGE is not set
# CONFIG_FOOTBRIDGE_HOST is not set
@@ -63,15 +59,12 @@
#
# General setup
#
-# CONFIG_SA1100_CERF_CMDLINE is not set
CONFIG_HOTPLUG=y

#
# PCMCIA/CardBus support
#
CONFIG_PCMCIA=y
-# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_SA1100_PCMCIA=y
CONFIG_VIRTUAL_BUS=y
CONFIG_NET=y
CONFIG_SYSVIPC=y
@@ -134,10 +127,8 @@
CONFIG_IP_PNP=y
CONFIG_IP_PNP_BOOTP=y
# CONFIG_IP_PNP_RARP is not set
-# CONFIG_IP_ROUTER is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_ALIAS is not set
# CONFIG_INET_ECN is not set
# CONFIG_SYN_COOKIES is not set
# CONFIG_IPV6 is not set
@@ -182,7 +173,6 @@
# Ethernet (10 or 100Mbit)
#
CONFIG_NET_ETHERNET=y
-CONFIG_CERF_CS8900A=y
# CONFIG_ARM_AM79C961A is not set
# CONFIG_NET_VENDOR_3COM is not set
# CONFIG_LANCE is not set
@@ -293,8 +283,6 @@
# CONFIG_VT_CONSOLE is not set
CONFIG_SERIAL_SA1100=y
CONFIG_SERIAL_SA1100_CONSOLE=y
-CONFIG_TOUCHSCREEN_UCB1200=y
-# CONFIG_TOUCHSCREEN_BITSY is not set
# CONFIG_SERIAL is not set
# CONFIG_SERIAL_EXTENDED is not set
# CONFIG_SERIAL_NONSTANDARD is not set
@@ -339,7 +327,6 @@
# CONFIG_FTAPE is not set
# CONFIG_AGP is not set
# CONFIG_DRM is not set
-# CONFIG_PCMCIA_SERIAL is not set

#
# File systems
@@ -426,7 +413,6 @@
#
# Kernel hacking
#
-CONFIG_FRAME_POINTER=y
CONFIG_DEBUG_ERRORS=y
CONFIG_DEBUG_USER=y
# CONFIG_DEBUG_INFO is not set
--- arch/arm/def-configs/clps7500 Mon Sep 18 18:15:24 2000
+++ arch/arm/def-configs/clps7500.tweaked Thu Apr 19 12:23:56 2001
@@ -37,7 +37,6 @@
CONFIG_CPU_32=y
# CONFIG_CPU_26 is not set
CONFIG_CPU_32v3=y
-CONFIG_CPU_ARM7=y
# CONFIG_DISCONTIGMEM is not set
# CONFIG_PCI is not set
# CONFIG_ISA is not set
@@ -143,7 +142,6 @@
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=4096
# CONFIG_BLK_DEV_INITRD is not set
-CONFIG_BLK_DEV_FLD7500=y

#
# Networking options
@@ -159,10 +157,8 @@
CONFIG_IP_PNP=y
CONFIG_IP_PNP_BOOTP=y
# CONFIG_IP_PNP_RARP is not set
-# CONFIG_IP_ROUTER is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_ALIAS is not set
# CONFIG_INET_ECN is not set
# CONFIG_SYN_COOKIES is not set
# CONFIG_IPV6 is not set
@@ -255,7 +251,6 @@
# Wan interfaces
#
# CONFIG_WAN is not set
-# CONFIG_ASH is not set

#
# Amateur Radio support
@@ -338,7 +333,6 @@
# Watchdog Cards
#
# CONFIG_WATCHDOG is not set
-CONFIG_CLPS7500_FLASH=y
# CONFIG_NVRAM is not set
# CONFIG_RTC is not set

@@ -482,7 +476,6 @@
#
# Kernel hacking
#
-# CONFIG_FRAME_POINTER is not set
# CONFIG_DEBUG_ERRORS is not set
# CONFIG_DEBUG_USER is not set
# CONFIG_DEBUG_INFO is not set
--- arch/arm/def-configs/ebsa110 Mon Nov 27 20:07:59 2000
+++ arch/arm/def-configs/ebsa110.tweaked Thu Apr 19 12:23:56 2001
@@ -497,7 +497,6 @@
#
# Kernel hacking
#
-CONFIG_FRAME_POINTER=y
CONFIG_DEBUG_ERRORS=y
# CONFIG_DEBUG_USER is not set
# CONFIG_DEBUG_INFO is not set
--- arch/arm/def-configs/empeg Wed Oct 20 19:29:08 1999
+++ arch/arm/def-configs/empeg.tweaked Thu Apr 19 12:23:56 2001
@@ -18,15 +18,10 @@
# CONFIG_SA1100_ITSY is not set
# CONFIG_SA1100_PLEB is not set
# CONFIG_SA1100_VICTOR is not set
-# CONFIG_EMPEG_HENRY is not set
# CONFIG_ARCH_ACORN is not set
# CONFIG_ISA_DMA is not set
CONFIG_CPU_32=y
# CONFIG_CPU_26 is not set
-# CONFIG_CPU_ARM2 is not set
-# CONFIG_CPU_ARM3 is not set
-# CONFIG_CPU_ARM6 is not set
-# CONFIG_CPU_ARM7 is not set
CONFIG_CPU_SA110=y

#
@@ -101,8 +96,6 @@
# CONFIG_WATCHDOG is not set
# CONFIG_NVRAM is not set
# CONFIG_RTC is not set
-CONFIG_EMPEG_IR=y
-CONFIG_EMPEG_USB=y

#
# Video For Linux
@@ -114,7 +107,6 @@
# CONFIG_RADIO_CADET is not set
# CONFIG_RADIO_MIROPCM20 is not set
# CONFIG_RADIO_GEMTEK is not set
-CONFIG_RADIO_EMPEG=y
# CONFIG_VIDEO_BT848 is not set
# CONFIG_VIDEO_PMS is not set
# CONFIG_VIDEO_SAA5249 is not set
@@ -138,19 +130,15 @@
#
# CONFIG_PACKET is not set
# CONFIG_NETLINK is not set
-# CONFIG_FIREWALL is not set
# CONFIG_FILTER is not set
# CONFIG_UNIX is not set
CONFIG_INET=y
# CONFIG_IP_MULTICAST is not set
# CONFIG_IP_ADVANCED_ROUTER is not set
# CONFIG_IP_PNP is not set
-# CONFIG_IP_ROUTER is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_ALIAS is not set
# CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_RARP is not set
# CONFIG_SKB_LARGE is not set
# CONFIG_IPV6 is not set
# CONFIG_IPX is not set
@@ -163,7 +151,6 @@
# CONFIG_WAN_ROUTER is not set
# CONFIG_NET_FASTROUTE is not set
# CONFIG_NET_HW_FLOWCONTROL is not set
-# CONFIG_CPU_IS_SLOW is not set

#
# QoS and/or fair queueing
@@ -255,10 +242,8 @@
#
# Kernel hacking
#
-CONFIG_FRAME_POINTER=y
CONFIG_DEBUG_ERRORS=y
CONFIG_DEBUG_USER=y
-CONFIG_DEBUG_USER_BACKTRACE=y
# CONFIG_DEBUG_INFO is not set
# CONFIG_MAGIC_SYSRQ is not set
# CONFIG_DEBUG_LL is not set
--- arch/arm/def-configs/footbridge Mon Nov 27 20:07:59 2000
+++ arch/arm/def-configs/footbridge.tweaked Thu Apr 19 12:23:57 2001
@@ -265,7 +265,6 @@
# CONFIG_NE3210 is not set
# CONFIG_ES3210 is not set
# CONFIG_8139TOO is not set
-# CONFIG_RTL8129 is not set
# CONFIG_SIS900 is not set
# CONFIG_EPIC100 is not set
# CONFIG_SUNDANCE is not set
@@ -586,7 +585,6 @@
# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIDEO_BUZ is not set
# CONFIG_VIDEO_ZR36120 is not set
-CONFIG_VIDEO_CYBERPRO=m

#
# Radio Adapters
@@ -746,7 +744,6 @@
# CONFIG_FB_CLGEN is not set
# CONFIG_FB_PM2 is not set
# CONFIG_FB_ACORN is not set
-# CONFIG_FB_CLPS711X is not set
CONFIG_FB_CYBER2000=y
# CONFIG_FB_SA1100 is not set
# CONFIG_FB_MATROX is not set
@@ -826,7 +823,6 @@
# CONFIG_SOUND_YM3812 is not set
# CONFIG_SOUND_OPL3SA1 is not set
# CONFIG_SOUND_OPL3SA2 is not set
-# CONFIG_SOUND_YMPCI is not set
# CONFIG_SOUND_UART6850 is not set
# CONFIG_SOUND_AEDSP16 is not set
CONFIG_SOUND_WAVEARTIST=m
@@ -885,7 +881,6 @@
#
# Kernel hacking
#
-CONFIG_FRAME_POINTER=y
CONFIG_DEBUG_ERRORS=y
CONFIG_DEBUG_USER=y
# CONFIG_DEBUG_INFO is not set
--- arch/arm/def-configs/graphicsclient Mon Nov 27 20:07:59 2000
+++ arch/arm/def-configs/graphicsclient.tweaked Thu Apr 19 12:23:57 2001
@@ -52,8 +52,6 @@
# CONFIG_SA1100_SHERMAN is not set
# CONFIG_SA1100_XP860 is not set
# CONFIG_ANGELBOOT is not set
-# CONFIG_SA1100_FREQUENCY_SCALE is not set
-# CONFIG_SA1100_VOLTAGE_SCALE is not set
# CONFIG_ARCH_ACORN is not set
# CONFIG_FOOTBRIDGE is not set
# CONFIG_FOOTBRIDGE_HOST is not set
@@ -81,8 +79,6 @@
# PCMCIA/CardBus support
#
CONFIG_PCMCIA=y
-# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_SA1100_PCMCIA=y
CONFIG_VIRTUAL_BUS=y
CONFIG_NET=y
CONFIG_SYSVIPC=y
@@ -341,8 +337,6 @@
CONFIG_SERIAL_SA1100=y
CONFIG_SERIAL_SA1100_CONSOLE=y
CONFIG_SA1100_DEFAULT_BAUDRATE=38400
-# CONFIG_TOUCHSCREEN_UCB1200 is not set
-# CONFIG_TOUCHSCREEN_BITSY is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=32

@@ -384,7 +378,6 @@
# CONFIG_FTAPE is not set
# CONFIG_AGP is not set
# CONFIG_DRM is not set
-# CONFIG_PCMCIA_SERIAL is not set

#
# File systems
@@ -536,7 +529,6 @@
#
# Kernel hacking
#
-CONFIG_FRAME_POINTER=y
CONFIG_DEBUG_ERRORS=y
CONFIG_DEBUG_USER=y
# CONFIG_DEBUG_INFO is not set
--- arch/arm/def-configs/integrator Mon Nov 27 20:07:59 2000
+++ arch/arm/def-configs/integrator.tweaked Thu Apr 19 12:23:57 2001
@@ -58,11 +58,6 @@
#
CONFIG_CPU_32v4=y
CONFIG_CPU_ARM720=y
-CONFIG_CPU_ARM920=y
-CONFIG_CPU_ARM920_CPU_IDLE=y
-CONFIG_CPU_ARM920_I_CACHE_ON=y
-CONFIG_CPU_ARM920_D_CACHE_ON=y
-# CONFIG_CPU_ARM920_WRITETHROUGH is not set
# CONFIG_DISCONTIGMEM is not set

#
@@ -139,7 +134,6 @@
CONFIG_MTD_BLOCK=y
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
-CONFIG_MTD_ARM=y

#
# Plug and Play configuration
@@ -249,7 +243,6 @@
# CONFIG_NE3210 is not set
# CONFIG_ES3210 is not set
# CONFIG_8139TOO is not set
-# CONFIG_RTL8129 is not set
# CONFIG_SIS900 is not set
# CONFIG_EPIC100 is not set
# CONFIG_SUNDANCE is not set
@@ -503,7 +496,6 @@
#
# Kernel hacking
#
-CONFIG_FRAME_POINTER=y
CONFIG_DEBUG_ERRORS=y
CONFIG_DEBUG_USER=y
# CONFIG_DEBUG_INFO is not set
--- arch/arm/def-configs/lart Mon Sep 18 18:15:24 2000
+++ arch/arm/def-configs/lart.tweaked Thu Apr 19 12:23:57 2001
@@ -33,13 +33,10 @@
# CONFIG_SA1100_CERF is not set
# CONFIG_SA1100_BITSY is not set
CONFIG_SA1100_LART=y
-# CONFIG_SA1100_THINCLIENT is not set
# CONFIG_SA1100_GRAPHICSCLIENT is not set
# CONFIG_SA1100_NANOENGINE is not set
# CONFIG_SA1100_VICTOR is not set
# CONFIG_ANGELBOOT is not set
-CONFIG_SA1100_FREQUENCY_SCALE=m
-CONFIG_SA1100_VOLTAGE_SCALE=y
# CONFIG_ARCH_ACORN is not set
# CONFIG_FOOTBRIDGE is not set
# CONFIG_FOOTBRIDGE_HOST is not set
@@ -126,10 +123,8 @@
# CONFIG_IP_MULTICAST is not set
# CONFIG_IP_ADVANCED_ROUTER is not set
# CONFIG_IP_PNP is not set
-# CONFIG_IP_ROUTER is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_ALIAS is not set
# CONFIG_INET_ECN is not set
# CONFIG_SYN_COOKIES is not set
# CONFIG_IPV6 is not set
@@ -192,7 +187,6 @@
# CONFIG_LNE390 is not set
# CONFIG_NE3210 is not set
# CONFIG_NE2K_PCI is not set
-# CONFIG_RTL8129 is not set
# CONFIG_8139TOO is not set
# CONFIG_SIS900 is not set
# CONFIG_TLAN is not set
@@ -309,8 +303,6 @@
# CONFIG_VT is not set
CONFIG_SERIAL_SA1100=y
CONFIG_SERIAL_SA1100_CONSOLE=y
-CONFIG_TOUCHSCREEN_UCB1200=m
-# CONFIG_TOUCHSCREEN_BITSY is not set
# CONFIG_SERIAL is not set
# CONFIG_SERIAL_EXTENDED is not set
# CONFIG_SERIAL_NONSTANDARD is not set
@@ -471,12 +463,10 @@
# CONFIG_SOUND_YM3812 is not set
# CONFIG_SOUND_OPL3SA1 is not set
# CONFIG_SOUND_OPL3SA2 is not set
-# CONFIG_SOUND_YMPCI is not set
# CONFIG_SOUND_UART6850 is not set
# CONFIG_SOUND_AEDSP16 is not set
# CONFIG_SOUND_VIDC is not set
# CONFIG_SOUND_WAVEARTIST is not set
-CONFIG_SOUND_SA1100_SSP=m
# CONFIG_SOUND_TVMIXER is not set

#
@@ -487,7 +477,6 @@
#
# Kernel hacking
#
-CONFIG_FRAME_POINTER=y
CONFIG_DEBUG_ERRORS=y
CONFIG_DEBUG_USER=y
# CONFIG_DEBUG_INFO is not set
--- arch/arm/def-configs/lusl7200 Mon Jun 19 20:59:33 2000
+++ arch/arm/def-configs/lusl7200.tweaked Thu Apr 19 12:23:57 2001
@@ -84,7 +84,6 @@
# CONFIG_BLK_DEV_LVM is not set
# CONFIG_BLK_DEV_MD is not set
# CONFIG_MD_LINEAR is not set
-# CONFIG_MD_STRIPED is not set
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_INITRD=y

@@ -221,7 +220,6 @@
#
# Kernel hacking
#
-CONFIG_FRAME_POINTER=y
CONFIG_DEBUG_ERRORS=y
CONFIG_DEBUG_USER=y
CONFIG_DEBUG_INFO=y
--- arch/arm/def-configs/neponset Mon Nov 27 20:07:59 2000
+++ arch/arm/def-configs/neponset.tweaked Thu Apr 19 12:23:57 2001
@@ -54,8 +54,6 @@
# CONFIG_SA1100_XP860 is not set
CONFIG_ANGELBOOT=y
CONFIG_SA1111=y
-CONFIG_SA1100_FREQUENCY_SCALE=y
-# CONFIG_SA1100_VOLTAGE_SCALE is not set
# CONFIG_ARCH_ACORN is not set
# CONFIG_FOOTBRIDGE is not set
# CONFIG_FOOTBRIDGE_HOST is not set
@@ -83,8 +81,6 @@
# PCMCIA/CardBus support
#
CONFIG_PCMCIA=y
-# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_SA1100_PCMCIA=y
CONFIG_VIRTUAL_BUS=y
CONFIG_NET=y
CONFIG_SYSVIPC=y
@@ -343,8 +339,6 @@
CONFIG_SERIAL_SA1100=y
CONFIG_SERIAL_SA1100_CONSOLE=y
CONFIG_SA1100_DEFAULT_BAUDRATE=9600
-CONFIG_TOUCHSCREEN_UCB1200=y
-# CONFIG_TOUCHSCREEN_BITSY is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=32

@@ -389,7 +383,6 @@
# CONFIG_FTAPE is not set
# CONFIG_AGP is not set
# CONFIG_DRM is not set
-# CONFIG_PCMCIA_SERIAL is not set

#
# File systems
@@ -525,7 +518,6 @@
CONFIG_DUMMY_CONSOLE=y
# CONFIG_FB_CYBER2000 is not set
CONFIG_FB_SA1100=y
-# CONFIG_FB_MQ200 is not set
# CONFIG_FB_VIRTUAL is not set
# CONFIG_FBCON_ADVANCED is not set
CONFIG_FBCON_CFB2=y
@@ -544,7 +536,6 @@
# Sound
#
CONFIG_SOUND=y
-CONFIG_SOUND_UDA1341=y
# CONFIG_SOUND_CMPCI is not set
# CONFIG_SOUND_EMU10K1 is not set
# CONFIG_SOUND_FUSION is not set
@@ -568,7 +559,6 @@
#
# Kernel hacking
#
-CONFIG_FRAME_POINTER=y
CONFIG_DEBUG_ERRORS=y
CONFIG_DEBUG_USER=y
# CONFIG_DEBUG_INFO is not set
--- arch/arm/def-configs/pangolin Mon Nov 27 20:07:59 2000
+++ arch/arm/def-configs/pangolin.tweaked Thu Apr 19 12:23:57 2001
@@ -53,8 +53,6 @@
# CONFIG_SA1100_XP860 is not set
CONFIG_SA1100_PANGOLIN=y
# CONFIG_ANGELBOOT is not set
-# CONFIG_SA1100_FREQUENCY_SCALE is not set
-# CONFIG_SA1100_VOLTAGE_SCALE is not set
# CONFIG_ARCH_ACORN is not set
# CONFIG_FOOTBRIDGE is not set
# CONFIG_FOOTBRIDGE_HOST is not set
@@ -78,8 +76,6 @@
# PCMCIA/CardBus support
#
CONFIG_PCMCIA=y
-# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_SA1100_PCMCIA=y
CONFIG_VIRTUAL_BUS=y
CONFIG_NET=y
CONFIG_SYSVIPC=y
@@ -345,8 +341,6 @@
CONFIG_SERIAL_SA1100=y
CONFIG_SERIAL_SA1100_CONSOLE=y
CONFIG_SA1100_DEFAULT_BAUDRATE=115200
-# CONFIG_TOUCHSCREEN_UCB1200 is not set
-# CONFIG_TOUCHSCREEN_BITSY is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=32

@@ -384,7 +378,6 @@
# CONFIG_FTAPE is not set
# CONFIG_AGP is not set
# CONFIG_DRM is not set
-# CONFIG_PCMCIA_SERIAL is not set

#
# File systems
@@ -483,7 +476,6 @@
#
# Kernel hacking
#
-CONFIG_FRAME_POINTER=y
CONFIG_DEBUG_ERRORS=y
CONFIG_DEBUG_USER=y
# CONFIG_DEBUG_INFO is not set
--- arch/arm/def-configs/rpc Mon Nov 27 20:07:59 2000
+++ arch/arm/def-configs/rpc.tweaked Thu Apr 19 12:23:57 2001
@@ -59,8 +59,6 @@
# Processor Type
#
CONFIG_CPU_32v3=y
-CONFIG_CPU_ARM6=y
-CONFIG_CPU_ARM7=y
CONFIG_CPU_SA110=y
# CONFIG_DISCONTIGMEM is not set

@@ -613,7 +611,6 @@
CONFIG_FB=y
CONFIG_DUMMY_CONSOLE=y
CONFIG_FB_ACORN=y
-# CONFIG_FB_CLPS711X is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_SA1100 is not set
# CONFIG_FB_VIRTUAL is not set
@@ -688,7 +685,6 @@
# CONFIG_SOUND_YM3812 is not set
# CONFIG_SOUND_OPL3SA1 is not set
# CONFIG_SOUND_OPL3SA2 is not set
-# CONFIG_SOUND_YMPCI is not set
# CONFIG_SOUND_UART6850 is not set
# CONFIG_SOUND_AEDSP16 is not set
CONFIG_SOUND_VIDC=m
@@ -702,7 +698,6 @@
#
# Kernel hacking
#
-CONFIG_FRAME_POINTER=y
CONFIG_DEBUG_ERRORS=y
CONFIG_DEBUG_USER=y
# CONFIG_DEBUG_INFO is not set
--- arch/arm/def-configs/shark Mon Sep 18 18:15:24 2000
+++ arch/arm/def-configs/shark.tweaked Thu Apr 19 12:23:57 2001
@@ -122,10 +122,8 @@
# CONFIG_IP_MULTICAST is not set
# CONFIG_IP_ADVANCED_ROUTER is not set
# CONFIG_IP_PNP is not set
-# CONFIG_IP_ROUTER is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_ALIAS is not set
# CONFIG_INET_ECN is not set
# CONFIG_SYN_COOKIES is not set
# CONFIG_IPV6 is not set
@@ -192,7 +190,6 @@
# CONFIG_LNE390 is not set
# CONFIG_NE3210 is not set
# CONFIG_NE2K_PCI is not set
-# CONFIG_RTL8129 is not set
# CONFIG_8139TOO is not set
# CONFIG_SIS900 is not set
# CONFIG_TLAN is not set
@@ -230,7 +227,6 @@
# Wan interfaces
#
# CONFIG_WAN is not set
-# CONFIG_ASH is not set

#
# Amateur Radio support
@@ -633,7 +629,6 @@
# CONFIG_SOUND_YM3812 is not set
# CONFIG_SOUND_OPL3SA1 is not set
# CONFIG_SOUND_OPL3SA2 is not set
-# CONFIG_SOUND_YMPCI is not set
# CONFIG_SOUND_UART6850 is not set
# CONFIG_SOUND_AEDSP16 is not set
# CONFIG_SOUND_VIDC is not set
@@ -647,7 +642,6 @@
#
# Kernel hacking
#
-# CONFIG_FRAME_POINTER is not set
CONFIG_DEBUG_ERRORS=y
CONFIG_DEBUG_USER=y
# CONFIG_DEBUG_INFO is not set
--- arch/arm/def-configs/sherman Mon Nov 27 20:07:59 2000
+++ arch/arm/def-configs/sherman.tweaked Thu Apr 19 12:23:57 2001
@@ -19,15 +19,10 @@
# CONFIG_SA1100_PLEB is not set
# CONFIG_SA1100_VICTOR is not set
CONFIG_SA1100_SHERMAN=y
-# CONFIG_VICTOR_BOARD1 is not set
# CONFIG_ARCH_ACORN is not set
# CONFIG_ISA_DMA is not set
CONFIG_CPU_32=y
# CONFIG_CPU_26 is not set
-# CONFIG_CPU_ARM2 is not set
-# CONFIG_CPU_ARM3 is not set
-# CONFIG_CPU_ARM6 is not set
-# CONFIG_CPU_ARM7 is not set
CONFIG_CPU_SA110=y

#
@@ -202,7 +197,6 @@
#
# Kernel hacking
#
-CONFIG_FRAME_POINTER=y
CONFIG_DEBUG_ERRORS=y
CONFIG_DEBUG_USER=y
CONFIG_DEBUG_INFO=y
--- arch/arm/def-configs/victor Mon Jun 19 20:59:33 2000
+++ arch/arm/def-configs/victor.tweaked Thu Apr 19 12:23:57 2001
@@ -18,15 +18,10 @@
# CONFIG_SA1100_ITSY is not set
# CONFIG_SA1100_PLEB is not set
CONFIG_SA1100_VICTOR=y
-# CONFIG_VICTOR_BOARD1 is not set
# CONFIG_ARCH_ACORN is not set
# CONFIG_ISA_DMA is not set
CONFIG_CPU_32=y
# CONFIG_CPU_26 is not set
-# CONFIG_CPU_ARM2 is not set
-# CONFIG_CPU_ARM3 is not set
-# CONFIG_CPU_ARM6 is not set
-# CONFIG_CPU_ARM7 is not set
CONFIG_CPU_SA110=y

#
@@ -195,7 +190,6 @@
#
# Kernel hacking
#
-CONFIG_FRAME_POINTER=y
CONFIG_DEBUG_ERRORS=y
CONFIG_DEBUG_USER=y
# CONFIG_DEBUG_INFO is not set
--- arch/arm/defconfig Mon Jun 19 20:59:33 2000
+++ arch/arm/defconfig.tweaked Thu Apr 19 12:23:57 2001
@@ -18,7 +18,6 @@
# CONFIG_ARCH_EBSA110 is not set
CONFIG_FOOTBRIDGE=y
CONFIG_HOST_FOOTBRIDGE=y
-# CONFIG_ADDIN_FOOTBRIDGE is not set
CONFIG_ARCH_EBSA285=y
# CONFIG_ARCH_CATS is not set
CONFIG_ARCH_NETWINDER=y
@@ -138,7 +137,6 @@
CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_MD=y
CONFIG_MD_LINEAR=m
-CONFIG_MD_STRIPED=m
CONFIG_BLK_DEV_RAM=y
# CONFIG_BLK_DEV_INITRD is not set

@@ -266,7 +264,6 @@
CONFIG_USB_AUDIO=m
CONFIG_USB_ACM=m
# CONFIG_USB_SERIAL is not set
-# CONFIG_USB_CPIA is not set
# CONFIG_USB_IBMCAM is not set
# CONFIG_USB_OV511 is not set
# CONFIG_USB_DC2XX is not set
@@ -289,8 +286,6 @@
# CONFIG_USB_WMFORCE is not set
CONFIG_INPUT_KEYBDEV=m
CONFIG_INPUT_MOUSEDEV=m
-CONFIG_INPUT_MOUSEDEV_MIX=y
-# CONFIG_INPUT_MOUSEDEV_DIGITIZER is not set
# CONFIG_INPUT_JOYDEV is not set
# CONFIG_INPUT_EVDEV is not set

@@ -356,10 +351,8 @@
CONFIG_IP_PNP=y
CONFIG_IP_PNP_BOOTP=y
# CONFIG_IP_PNP_RARP is not set
-# CONFIG_IP_ROUTER is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
-CONFIG_IP_ALIAS=y
# CONFIG_SYN_COOKIES is not set

#
@@ -447,7 +440,6 @@
# CONFIG_LNE390 is not set
# CONFIG_NE3210 is not set
CONFIG_NE2K_PCI=y
-# CONFIG_RTL8129 is not set
# CONFIG_8139TOO is not set
# CONFIG_SIS900 is not set
# CONFIG_TLAN is not set
@@ -529,7 +521,6 @@
CONFIG_BLK_DEV_OFFBOARD=y
CONFIG_IDEDMA_PCI_AUTO=y
CONFIG_BLK_DEV_IDEDMA=y
-CONFIG_IDEDMA_PCI_EXPERIMENTAL=y
# CONFIG_IDEDMA_PCI_WIP is not set
# CONFIG_IDEDMA_NEW_DRIVE_LISTINGS is not set
# CONFIG_BLK_DEV_AEC62XX is not set
@@ -539,14 +530,11 @@
# CONFIG_BLK_DEV_AMD7409 is not set
# CONFIG_AMD7409_OVERRIDE is not set
# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_CMD64X_RAID is not set
CONFIG_BLK_DEV_CY82C693=y
# CONFIG_BLK_DEV_CS5530 is not set
# CONFIG_BLK_DEV_HPT34X is not set
# CONFIG_HPT34X_AUTODMA is not set
# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_HPT366_FIP is not set
-# CONFIG_HPT366_MODE3 is not set
# CONFIG_BLK_DEV_NS87415 is not set
# CONFIG_BLK_DEV_OPTI621 is not set
CONFIG_BLK_DEV_PDC202XX=y
@@ -714,7 +702,6 @@
#
# Kernel hacking
#
-CONFIG_FRAME_POINTER=y
CONFIG_DEBUG_ERRORS=y
CONFIG_DEBUG_USER=y
# CONFIG_DEBUG_INFO is not set
--- arch/cris/defconfig Wed Apr 18 16:47:32 2001
+++ arch/cris/defconfig.tweaked Thu Apr 19 12:23:57 2001
@@ -89,10 +89,6 @@
CONFIG_PB_CHANGEABLE_DIR=00
CONFIG_PB_CHANGEABLE_BITS=FF
# CONFIG_JULIETTE is not set
-# CONFIG_JULIETTE_VIDEO is not set
-# CONFIG_JULIETTE_CCD is not set
-# CONFIG_JULIETTE_SS1M is not set
-# CONFIG_JULIETTE_MEGCCD is not set
# CONFIG_ETRAX_USB_HOST is not set

#
@@ -110,26 +106,17 @@
# CONFIG_MTD_ROM is not set
# CONFIG_MTD_MTDRAM is not set
CONFIG_MTD_CFI=y
-# CONFIG_MTD_CFI_GEOMETRY is not set
# CONFIG_MTD_CFI_INTELEXT is not set
CONFIG_MTD_CFI_AMDSTD=y
CONFIG_MTD_AMDSTD=y
-# CONFIG_MTD_SHARP is not set
# CONFIG_MTD_PHYSMAP is not set
# CONFIG_MTD_NORA is not set
# CONFIG_MTD_PNC2000 is not set
# CONFIG_MTD_RPXLITE is not set
-# CONFIG_MTD_SBC_MEDIAGX is not set
-# CONFIG_MTD_ELAN_104NC is not set
-# CONFIG_MTD_SA1100 is not set
-# CONFIG_MTD_DC21285 is not set
-# CONFIG_MTD_CSTM_CFI_JEDEC is not set
# CONFIG_MTD_JEDEC is not set
# CONFIG_MTD_MIXMEM is not set
# CONFIG_MTD_OCTAGON is not set
# CONFIG_MTD_VMAX is not set
-# CONFIG_MTD_NAND is not set
-# CONFIG_MTD_NAND_SPIA is not set
CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y
# CONFIG_FTL is not set
--- arch/ia64/defconfig Thu Jun 22 10:09:44 2000
+++ arch/ia64/defconfig.tweaked Thu Apr 19 12:23:57 2001
@@ -112,24 +112,18 @@
# CONFIG_BLK_DEV_OFFBOARD is not set
CONFIG_IDEDMA_PCI_AUTO=y
CONFIG_BLK_DEV_IDEDMA=y
-CONFIG_IDEDMA_PCI_EXPERIMENTAL=y
# CONFIG_IDEDMA_PCI_WIP is not set
# CONFIG_IDEDMA_NEW_DRIVE_LISTINGS is not set
-# CONFIG_BLK_DEV_AEC6210 is not set
-# CONFIG_AEC6210_TUNING is not set
# CONFIG_BLK_DEV_ALI15X3 is not set
# CONFIG_WDC_ALI15X3 is not set
# CONFIG_BLK_DEV_AMD7409 is not set
# CONFIG_AMD7409_OVERRIDE is not set
# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_CMD64X_RAID is not set
# CONFIG_BLK_DEV_CY82C693 is not set
# CONFIG_BLK_DEV_CS5530 is not set
# CONFIG_BLK_DEV_HPT34X is not set
# CONFIG_HPT34X_AUTODMA is not set
# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_HPT366_FIP is not set
-# CONFIG_HPT366_MODE3 is not set
CONFIG_BLK_DEV_PIIX=y
CONFIG_PIIX_TUNING=y
# CONFIG_BLK_DEV_NS87415 is not set
@@ -275,4 +269,3 @@
# CONFIG_IA64_DEBUG_CMPXCHG is not set
# CONFIG_IA64_DEBUG_IRQ is not set
# CONFIG_IA64_PRINT_HAZARDS is not set
-# CONFIG_KDB is not set
--- arch/m68k/defconfig Mon Jun 19 15:56:08 2000
+++ arch/m68k/defconfig.tweaked Thu Apr 19 12:23:57 2001
@@ -86,10 +86,8 @@
# CONFIG_IP_MULTICAST is not set
# CONFIG_IP_ADVANCED_ROUTER is not set
# CONFIG_IP_PNP is not set
-# CONFIG_IP_ROUTER is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_ALIAS is not set
# CONFIG_SYN_COOKIES is not set

#
--- arch/mips/defconfig-ddb5476 Wed Apr 18 16:47:36 2001
+++ arch/mips/defconfig-ddb5476.tweaked Thu Apr 19 12:23:57 2001
@@ -1,7 +1,6 @@
#
# Automatically generated make config: don't edit
#
-CONFIG_MIPS=y
# CONFIG_SMP is not set

#
@@ -17,26 +16,18 @@
# CONFIG_BAGET_MIPS is not set
# CONFIG_DECSTATION is not set
# CONFIG_DDB5074 is not set
-# CONFIG_MIPS_EV96100 is not set
-# CONFIG_MIPS_EV64120 is not set
-# CONFIG_MIPS_ATLAS is not set
-# CONFIG_MIPS_MALTA is not set
# CONFIG_NINO is not set
-# CONFIG_MIPS_MAGNUM_4000 is not set
# CONFIG_MOMENCO_OCELOT is not set
CONFIG_DDB5476=y
# CONFIG_OLIVETTI_M700 is not set
# CONFIG_SGI_IP22 is not set
# CONFIG_SNI_RM200_PCI is not set
-# CONFIG_MIPS_ITE8172 is not set
-# CONFIG_MIPS_IVR is not set
# CONFIG_MCA is not set
# CONFIG_SBUS is not set
CONFIG_I8259=y
CONFIG_ISA=y
CONFIG_PCI=y
CONFIG_PC_KEYB=y
-CONFIG_ROTTEN_IRQ=y
CONFIG_EISA=y

#
@@ -67,7 +58,6 @@
# General setup
#
CONFIG_CPU_LITTLE_ENDIAN=y
-CONFIG_MIPS_FPU_EMULATOR=y
CONFIG_KCORE_ELF=y
CONFIG_ELF_KERNEL=y
# CONFIG_BINFMT_AOUT is not set
@@ -304,7 +294,6 @@
# CONFIG_NE3210 is not set
# CONFIG_ES3210 is not set
# CONFIG_8139TOO is not set
-# CONFIG_RTL8129 is not set
# CONFIG_SIS900 is not set
# CONFIG_EPIC100 is not set
# CONFIG_SUNDANCE is not set
@@ -312,7 +301,6 @@
# CONFIG_VIA_RHINE is not set
# CONFIG_WINBOND_840 is not set
# CONFIG_HAPPYMEAL is not set
-# CONFIG_LAN_SAA9730 is not set
# CONFIG_NET_POCKET is not set

#
@@ -536,6 +524,4 @@
#
CONFIG_CROSSCOMPILE=y
# CONFIG_REMOTE_DEBUG is not set
-# CONFIG_LL_DEBUG is not set
# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_MIPS_UNCACHED is not set
--- arch/mips/defconfig-it8172 Wed Apr 18 16:47:36 2001
+++ arch/mips/defconfig-it8172.tweaked Thu Apr 19 12:23:58 2001
@@ -1,7 +1,6 @@
#
# Automatically generated make config: don't edit
#
-CONFIG_MIPS=y
# CONFIG_SMP is not set

#
@@ -17,28 +16,20 @@
# CONFIG_BAGET_MIPS is not set
# CONFIG_DECSTATION is not set
# CONFIG_DDB5074 is not set
-# CONFIG_MIPS_EV96100 is not set
-# CONFIG_MIPS_EV64120 is not set
-# CONFIG_MIPS_ATLAS is not set
-# CONFIG_MIPS_MALTA is not set
# CONFIG_NINO is not set
-# CONFIG_MIPS_MAGNUM_4000 is not set
# CONFIG_MOMENCO_OCELOT is not set
# CONFIG_DDB5476 is not set
# CONFIG_OLIVETTI_M700 is not set
# CONFIG_SGI_IP22 is not set
# CONFIG_SNI_RM200_PCI is not set
-CONFIG_MIPS_ITE8172=y
# CONFIG_IT8172_REVC is not set
CONFIG_QTRONIX_KEYBOARD=y
CONFIG_IT8172_CIR=y
# CONFIG_IT8172_SCR0 is not set
# CONFIG_IT8172_SCR1 is not set
-# CONFIG_MIPS_IVR is not set
# CONFIG_MCA is not set
# CONFIG_SBUS is not set
CONFIG_PCI=y
-CONFIG_IT8712=y
CONFIG_PC_KEYB=y
# CONFIG_ISA is not set
# CONFIG_EISA is not set
@@ -74,7 +65,6 @@
# General setup
#
CONFIG_CPU_LITTLE_ENDIAN=y
-CONFIG_MIPS_FPU_EMULATOR=y
CONFIG_KCORE_ELF=y
CONFIG_ELF_KERNEL=y
# CONFIG_BINFMT_AOUT is not set
@@ -279,7 +269,6 @@
# CONFIG_HPT34X_AUTODMA is not set
# CONFIG_BLK_DEV_HPT366 is not set
CONFIG_BLK_DEV_IT8172=y
-CONFIG_IT8172_TUNING=y
# CONFIG_BLK_DEV_NS87415 is not set
# CONFIG_BLK_DEV_OPTI621 is not set
# CONFIG_BLK_DEV_PDC202XX is not set
@@ -365,7 +354,6 @@
# CONFIG_NE3210 is not set
# CONFIG_ES3210 is not set
CONFIG_8139TOO=y
-# CONFIG_RTL8129 is not set
# CONFIG_SIS900 is not set
# CONFIG_EPIC100 is not set
# CONFIG_SUNDANCE is not set
@@ -373,7 +361,6 @@
# CONFIG_VIA_RHINE is not set
# CONFIG_WINBOND_840 is not set
# CONFIG_HAPPYMEAL is not set
-# CONFIG_LAN_SAA9730 is not set
# CONFIG_NET_POCKET is not set

#
@@ -562,8 +549,5 @@
# Kernel hacking
#
CONFIG_CROSSCOMPILE=y
-# CONFIG_MIPS_FPE_MODULE is not set
# CONFIG_REMOTE_DEBUG is not set
-# CONFIG_LL_DEBUG is not set
# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_MIPS_UNCACHED is not set
--- arch/parisc/defconfig Thu Apr 19 12:18:57 2001
+++ arch/parisc/defconfig.tweaked Thu Apr 19 12:23:58 2001
@@ -175,7 +175,6 @@
# CONFIG_NE2K_PCI is not set
# CONFIG_NE3210 is not set
# CONFIG_ES3210 is not set
-# CONFIG_RTL8129 is not set
# CONFIG_8139TOO is not set
# CONFIG_SIS900 is not set
# CONFIG_EPIC100 is not set
@@ -222,7 +221,6 @@
CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_GSC_PS2=y
-CONFIG_HIL=y
CONFIG_SERIAL=y
CONFIG_SERIAL_CONSOLE=y
CONFIG_SERIAL_GSC=y
--- arch/parisc/defconfig~ Tue Dec 5 15:29:39 2000
+++ arch/parisc/defconfig~.tweaked Thu Apr 19 12:23:58 2001
@@ -175,7 +175,6 @@
# CONFIG_NE2K_PCI is not set
# CONFIG_NE3210 is not set
# CONFIG_ES3210 is not set
-# CONFIG_RTL8129 is not set
# CONFIG_8139TOO is not set
# CONFIG_SIS900 is not set
# CONFIG_EPIC100 is not set
@@ -222,7 +221,6 @@
CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_GSC_PS2=y
-CONFIG_HIL=y
CONFIG_SERIAL=y
CONFIG_SERIAL_CONSOLE=y
CONFIG_SERIAL_GSC=y
@@ -255,7 +253,6 @@
# Watchdog Cards
#
# CONFIG_WATCHDOG is not set
-CONFIG_GENRTC=y
# CONFIG_INTEL_RNG is not set
# CONFIG_NVRAM is not set
# CONFIG_RTC is not set
--- arch/ppc/configs/IVMS8_defconfig Sat Mar 3 13:52:13 2001
+++ arch/ppc/configs/IVMS8_defconfig.tweaked Thu Apr 19 12:23:58 2001
@@ -44,8 +44,6 @@
# CONFIG_SMP is not set
CONFIG_MACH_SPECIFIC=y
CONFIG_MATH_EMULATION=y
-CONFIG_SASH=y
-CONFIG_SASH_PATH="/bin/sash"

#
# General setup
@@ -116,10 +114,8 @@
CONFIG_IP_PNP=y
# CONFIG_IP_PNP_BOOTP is not set
# CONFIG_IP_PNP_RARP is not set
-# CONFIG_IP_ROUTER is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_ALIAS is not set
# CONFIG_INET_ECN is not set
# CONFIG_SYN_COOKIES is not set
# CONFIG_IPV6 is not set
@@ -321,7 +317,6 @@
# CONFIG_INTEL_RNG is not set
# CONFIG_NVRAM is not set
# CONFIG_RTC is not set
-# CONFIG_FLASH is not set

#
# Video For Linux
--- arch/ppc/configs/SM850_defconfig Sat Mar 3 13:52:13 2001
+++ arch/ppc/configs/SM850_defconfig.tweaked Thu Apr 19 12:23:58 2001
@@ -44,8 +44,6 @@
# CONFIG_SMP is not set
CONFIG_MACH_SPECIFIC=y
CONFIG_MATH_EMULATION=y
-CONFIG_SASH=y
-CONFIG_SASH_PATH="/bin/sash"

#
# General setup
@@ -116,10 +114,8 @@
CONFIG_IP_PNP=y
# CONFIG_IP_PNP_BOOTP is not set
# CONFIG_IP_PNP_RARP is not set
-# CONFIG_IP_ROUTER is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_ALIAS is not set
# CONFIG_INET_ECN is not set
# CONFIG_SYN_COOKIES is not set
# CONFIG_IPV6 is not set
@@ -284,8 +280,6 @@
# CONFIG_INTEL_RNG is not set
# CONFIG_NVRAM is not set
# CONFIG_RTC is not set
-CONFIG_FLASH=y
-CONFIG_AMD_FLASH=y

#
# Video For Linux
--- arch/ppc/configs/SPD823TS_defconfig Sat Mar 3 13:52:13 2001
+++ arch/ppc/configs/SPD823TS_defconfig.tweaked Thu Apr 19 12:23:58 2001
@@ -42,8 +42,6 @@
# CONFIG_SMP is not set
CONFIG_MACH_SPECIFIC=y
CONFIG_MATH_EMULATION=y
-CONFIG_SASH=y
-CONFIG_SASH_PATH="/bin/sash"

#
# General setup
@@ -114,10 +112,8 @@
CONFIG_IP_PNP=y
# CONFIG_IP_PNP_BOOTP is not set
# CONFIG_IP_PNP_RARP is not set
-# CONFIG_IP_ROUTER is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_ALIAS is not set
# CONFIG_INET_ECN is not set
# CONFIG_SYN_COOKIES is not set
# CONFIG_IPV6 is not set
@@ -282,7 +278,6 @@
# CONFIG_INTEL_RNG is not set
# CONFIG_NVRAM is not set
# CONFIG_RTC is not set
-# CONFIG_FLASH is not set

#
# Video For Linux
--- arch/ppc/configs/TQM823L_defconfig Sat Mar 3 13:52:13 2001
+++ arch/ppc/configs/TQM823L_defconfig.tweaked Thu Apr 19 12:23:58 2001
@@ -43,8 +43,6 @@
# CONFIG_SMP is not set
CONFIG_MACH_SPECIFIC=y
CONFIG_MATH_EMULATION=y
-CONFIG_SASH=y
-CONFIG_SASH_PATH="/bin/sash"

#
# General setup
@@ -115,10 +113,8 @@
CONFIG_IP_PNP=y
# CONFIG_IP_PNP_BOOTP is not set
# CONFIG_IP_PNP_RARP is not set
-# CONFIG_IP_ROUTER is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_ALIAS is not set
# CONFIG_INET_ECN is not set
# CONFIG_SYN_COOKIES is not set
# CONFIG_IPV6 is not set
@@ -283,8 +279,6 @@
# CONFIG_INTEL_RNG is not set
# CONFIG_NVRAM is not set
# CONFIG_RTC is not set
-CONFIG_FLASH=y
-CONFIG_AMD_FLASH=y

#
# Video For Linux
--- arch/ppc/configs/TQM850L_defconfig Sat Mar 3 13:52:13 2001
+++ arch/ppc/configs/TQM850L_defconfig.tweaked Thu Apr 19 12:23:58 2001
@@ -43,8 +43,6 @@
# CONFIG_SMP is not set
CONFIG_MACH_SPECIFIC=y
CONFIG_MATH_EMULATION=y
-CONFIG_SASH=y
-CONFIG_SASH_PATH="/bin/sash"

#
# General setup
@@ -115,10 +113,8 @@
CONFIG_IP_PNP=y
# CONFIG_IP_PNP_BOOTP is not set
# CONFIG_IP_PNP_RARP is not set
-# CONFIG_IP_ROUTER is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_ALIAS is not set
# CONFIG_INET_ECN is not set
# CONFIG_SYN_COOKIES is not set
# CONFIG_IPV6 is not set
@@ -283,8 +279,6 @@
# CONFIG_INTEL_RNG is not set
# CONFIG_NVRAM is not set
# CONFIG_RTC is not set
-CONFIG_FLASH=y
-CONFIG_AMD_FLASH=y

#
# Video For Linux
--- arch/ppc/configs/TQM860L_defconfig Sat Mar 3 13:52:13 2001
+++ arch/ppc/configs/TQM860L_defconfig.tweaked Thu Apr 19 12:23:58 2001
@@ -43,8 +43,6 @@
# CONFIG_SMP is not set
CONFIG_MACH_SPECIFIC=y
CONFIG_MATH_EMULATION=y
-CONFIG_SASH=y
-CONFIG_SASH_PATH="/bin/sash"

#
# General setup
@@ -115,10 +113,8 @@
CONFIG_IP_PNP=y
# CONFIG_IP_PNP_BOOTP is not set
# CONFIG_IP_PNP_RARP is not set
-# CONFIG_IP_ROUTER is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_ALIAS is not set
# CONFIG_INET_ECN is not set
# CONFIG_SYN_COOKIES is not set
# CONFIG_IPV6 is not set
@@ -283,8 +279,6 @@
# CONFIG_INTEL_RNG is not set
# CONFIG_NVRAM is not set
# CONFIG_RTC is not set
-CONFIG_FLASH=y
-CONFIG_AMD_FLASH=y

#
# Video For Linux
--- arch/ppc/configs/common_defconfig Sun Mar 4 17:30:18 2001
+++ arch/ppc/configs/common_defconfig.tweaked Thu Apr 19 12:23:58 2001
@@ -404,7 +404,6 @@
# CONFIG_NE3210 is not set
# CONFIG_ES3210 is not set
# CONFIG_8139TOO is not set
-# CONFIG_RTL8129 is not set
# CONFIG_SIS900 is not set
# CONFIG_EPIC100 is not set
# CONFIG_SUNDANCE is not set
--- arch/ppc/configs/ibmchrp_defconfig Mon Jan 22 18:41:14 2001
+++ arch/ppc/configs/ibmchrp_defconfig.tweaked Thu Apr 19 12:23:58 2001
@@ -26,7 +26,6 @@
# CONFIG_8260 is not set
# CONFIG_8xx is not set
CONFIG_ALL_PPC=y
-# CONFIG_GEMINI is not set
# CONFIG_APUS is not set
# CONFIG_PPC601_SYNC_FIX is not set
# CONFIG_SMP is not set
@@ -306,7 +305,6 @@
# CONFIG_NE3210 is not set
# CONFIG_ES3210 is not set
# CONFIG_8139TOO is not set
-# CONFIG_RTL8129 is not set
# CONFIG_SIS900 is not set
# CONFIG_EPIC100 is not set
# CONFIG_SUNDANCE is not set
--- arch/ppc/configs/power3_defconfig Mon Jan 22 18:41:15 2001
+++ arch/ppc/configs/power3_defconfig.tweaked Thu Apr 19 12:23:58 2001
@@ -105,8 +105,6 @@
CONFIG_MD_RAID0=y
CONFIG_MD_RAID1=y
CONFIG_MD_RAID5=y
-# CONFIG_MD_BOOT is not set
-# CONFIG_AUTODETECT_RAID is not set
CONFIG_BLK_DEV_LVM=y
CONFIG_LVM_PROC_FS=y

@@ -285,7 +283,6 @@
# CONFIG_NE3210 is not set
# CONFIG_ES3210 is not set
# CONFIG_8139TOO is not set
-# CONFIG_RTL8129 is not set
# CONFIG_SIS900 is not set
# CONFIG_EPIC100 is not set
# CONFIG_SUNDANCE is not set
@@ -643,7 +640,6 @@
# CONFIG_SOUND_YM3812 is not set
# CONFIG_SOUND_OPL3SA1 is not set
# CONFIG_SOUND_OPL3SA2 is not set
-# CONFIG_SOUND_YMPCI is not set
# CONFIG_SOUND_YMFPCI is not set
# CONFIG_SOUND_UART6850 is not set
# CONFIG_SOUND_AEDSP16 is not set
--- arch/ppc/defconfig Sun Mar 4 17:30:18 2001
+++ arch/ppc/defconfig.tweaked Thu Apr 19 12:23:58 2001
@@ -403,7 +403,6 @@
# CONFIG_NE3210 is not set
# CONFIG_ES3210 is not set
# CONFIG_8139TOO is not set
-# CONFIG_RTL8129 is not set
# CONFIG_SIS900 is not set
# CONFIG_EPIC100 is not set
# CONFIG_SUNDANCE is not set
--- arch/sh/defconfig Wed Aug 9 16:59:04 2000
+++ arch/sh/defconfig.tweaked Thu Apr 19 12:23:58 2001
@@ -202,5 +202,4 @@
# CONFIG_MAGIC_SYSRQ is not set
CONFIG_SH_STANDARD_BIOS=y
CONFIG_DEBUG_KERNEL_WITH_GDB_STUB=y
-CONFIG_GDB_STUB_VBR=a0000000
CONFIG_SH_EARLY_PRINTK=y
--
<a href="http://www.tuxedo.org/~esr/">Eric S. Raymond</a>

Love your country, but never trust its government.
-- Robert A. Heinlein.


2001-04-19 17:45:19

by Russell King

[permalink] [raw]
Subject: Re: Dead symbol elimination, stage 1

On Thu, Apr 19, 2001 at 01:19:44PM -0400, Eric S. Raymond wrote:
> The following patch cleans dead symbols out of the defconfigs in the 2.4.4pre4
> source tree. It corrects a typo involving CONFIG_GEN_RTC. Another typo
> involving CONFIG_SOUND_YMPCI doesn't need to be corrected, as the symbol
> is never set in these files.

As I said previously, please don't eliminate the ones on arch/arm -
you'll prevent me from sending a patch to Alan without a _lot_ more
work.

--
Russell King ([email protected]) The developer of ARM Linux
http://www.arm.linux.org.uk/personal/aboutme.html

2001-04-19 17:49:29

by David Woodhouse

[permalink] [raw]
Subject: Re: Dead symbol elimination, stage 1


> -# CONFIG_MTD_SBC_MEDIAGX is not set
> -# CONFIG_MTD_ELAN_104NC is not set
> -# CONFIG_MTD_SA1100 is not set
> -# CONFIG_MTD_DC21285 is not set
> -# CONFIG_MTD_CSTM_CFI_JEDEC is not set
> # CONFIG_MTD_JEDEC is not set
> # CONFIG_MTD_MIXMEM is not set
> # CONFIG_MTD_OCTAGON is not set
> # CONFIG_MTD_VMAX is not set
> -# CONFIG_MTD_NAND is not set
> -# CONFIG_MTD_NAND_SPIA is not set

Please don't. People using some of these embedded architectures need to
update to the latest MTD code (which includes those options) anyway, and I'm
hoping to merge that all into 2.4 shortly.

They're not doing any harm, are they?

--
dwmw2


2001-04-19 17:59:29

by Eric S. Raymond

[permalink] [raw]
Subject: Re: Dead symbol elimination, stage 1

Russell King <[email protected]>:
> On Thu, Apr 19, 2001 at 01:19:44PM -0400, Eric S. Raymond wrote:
> > The following patch cleans dead symbols out of the defconfigs in the 2.4.4pre4
> > source tree. It corrects a typo involving CONFIG_GEN_RTC. Another typo
> > involving CONFIG_SOUND_YMPCI doesn't need to be corrected, as the symbol
> > is never set in these files.
>
> As I said previously, please don't eliminate the ones on arch/arm -
> you'll prevent me from sending a patch to Alan without a _lot_ more
> work.

Um...this is what you said:

> The ones that show up in arch/arm/def-configs are purely because I've been
> keeping back the updates to these files; each time the config structure
> changes, I get a nice big patch from people with the new def-configs. I
> didn't want to inflict this too regularly on people.

I read this as "I haven't fixed the problem because..." not as "Don't
fix the problem." Please be more explicit next time so I won't step on
your toes?

I don't care whether it's you or me that cleans up this part of the
dead-symbol mess. I'm just trying to get it cleaned up.

I'm rather disturbed by the amount of crap kxref is turning up -- I
expected dozens of dodgy bits, but I'm finding hundreds. We need to pay
better attention to janitorial issues like this if the kernel code
isn't going to degenerate into an unmaintainable hairball.
--
<a href="http://www.tuxedo.org/~esr/">Eric S. Raymond</a>

False is the idea of utility that sacrifices a thousand real advantages for
one imaginary or trifling inconvenience; that would take fire from men because
it burns, and water because one may drown in it; that has no remedy for evils
except destruction. The laws that forbid the carrying of arms are laws of
such a nature. They disarm only those who are neither inclined nor determined
to commit crimes.
-- Cesare Beccaria, as quoted by Thomas Jefferson's Commonplace book

2001-04-19 18:06:20

by David Woodhouse

[permalink] [raw]
Subject: Re: Dead symbol elimination, stage 1


[email protected] said:
> I read this as "I haven't fixed the problem because..." not as
> "Don't fix the problem." Please be more explicit next time so I won't
> step on your toes?

"This is not a problem, please don't \"fix\" it".


--
dwmw2


2001-04-19 18:06:30

by Eric S. Raymond

[permalink] [raw]
Subject: Re: Dead symbol elimination, stage 1

David Woodhouse <[email protected]>:
>
> > -# CONFIG_MTD_SBC_MEDIAGX is not set
> > -# CONFIG_MTD_ELAN_104NC is not set
> > -# CONFIG_MTD_SA1100 is not set
> > -# CONFIG_MTD_DC21285 is not set
> > -# CONFIG_MTD_CSTM_CFI_JEDEC is not set
> > # CONFIG_MTD_JEDEC is not set
> > # CONFIG_MTD_MIXMEM is not set
> > # CONFIG_MTD_OCTAGON is not set
> > # CONFIG_MTD_VMAX is not set
> > -# CONFIG_MTD_NAND is not set
> > -# CONFIG_MTD_NAND_SPIA is not set
>
> Please don't. People using some of these embedded architectures need to
> update to the latest MTD code (which includes those options) anyway, and I'm
> hoping to merge that all into 2.4 shortly.

Well, then, those symbols will stop being dead. But note this: *none of
those MTD symbols are set*. So the effect of losing these would not be
to lose any CML1 information, merely to make a few more questions visible
during make oldconfig. This is a feature, not a bug.

> They're not doing any harm, are they?

They are helping create a dense thicket in which real bugs can hide.

The cross-referencer has already turned up several genuine errors,
and will doubtless turn up more -- but if the reports are stuffed
full of meaningless crap about undead defconfig symbols that aren't
even set, the genuine errors are going to be hard to notice.
--
<a href="http://www.tuxedo.org/~esr/">Eric S. Raymond</a>

In every country and in every age, the priest has been hostile to
liberty. He is always in alliance with the despot, abetting his abuses
in return for protection to his own.
-- Thomas Jefferson, 1814

2001-04-19 18:14:50

by Eric S. Raymond

[permalink] [raw]
Subject: Re: Dead symbol elimination, stage 1

David Woodhouse <[email protected]>:
>
> [email protected] said:
> > I read this as "I haven't fixed the problem because..." not as
> > "Don't fix the problem." Please be more explicit next time so I won't
> > step on your toes?
>
> "This is not a problem, please don't \"fix\" it".

But it is. The more false positives I get in the dead-symbol reports,
the harder it will be to spot real problems like that business in the
ARM kernel.c file.

I grant you this wasn't a problem before I wrote kxref.py, but it is
one now. New tools create new opportunities, but they sometimes require
better discipline and working practices to be useful. This is one of
those cases.
--
<a href="http://www.tuxedo.org/~esr/">Eric S. Raymond</a>

"I hold it, that a little rebellion, now and then, is a good thing, and as
necessary in the political world as storms in the physical."
-- Thomas Jefferson, Letter to James Madison, January 30, 1787

2001-04-19 19:37:09

by Russell King

[permalink] [raw]
Subject: Re: Dead symbol elimination, stage 1

Eric S. Raymond writes:
> > The ones that show up in arch/arm/def-configs are purely because I've been
> > keeping back the updates to these files; each time the config structure
> > changes, I get a nice big patch from people with the new def-configs. I
> > didn't want to inflict this too regularly on people.
>
> I read this as "I haven't fixed the problem because..." not as "Don't
> fix the problem." Please be more explicit next time so I won't step on
> your toes?

"Keeping back" implies that _I_ have the necessary changes and have not
passed them on.

> I'm rather disturbed by the amount of crap kxref is turning up -- I
> expected dozens of dodgy bits, but I'm finding hundreds. We need to pay
> better attention to janitorial issues like this if the kernel code
> isn't going to degenerate into an unmaintainable hairball.

The correct thing to do is to ensure that you are starting with an
up to date copy of the defconfig files. You can do this by passing them
through CML1's 'make oldconfig' before passing them through kxref.

Working with old files does nobody any good.

--
Russell King ([email protected]) The developer of ARM Linux
http://www.arm.linux.org.uk/personal/aboutme.html

2001-04-19 20:04:39

by Russell King

[permalink] [raw]
Subject: Re: Dead symbol elimination, stage 1

Eric,

Please apply this patch before doing anything in the ARM tree.

What you will find is that most of your symbols in these files were due
to it being out of date. However, I'd say the bigger problem is the
symbols that don't exist.

Also, you may not have the full story of the Config.in files - another
reason why you should not touch the architecture specific files. For
instance, a quick scan of my latest ARM patch reveals:

src@raistlin:[2]:<1009> grep 'diff.*Config.in' rmk1
diff -urN linux-orig/drivers/char/Config.in linux/drivers/char/Config.in
diff -urN linux-orig/drivers/media/video/Config.in linux/drivers/media/video/Config.in
diff -urN linux-orig/drivers/mtd/Config.in linux/drivers/mtd/Config.in
diff -urN linux-orig/drivers/net/Config.in linux/drivers/net/Config.in
diff -urN linux-orig/drivers/net/irda/Config.in linux/drivers/net/irda/Config.in
diff -urN linux-orig/drivers/pcmcia/Config.in linux/drivers/pcmcia/Config.in
diff -urN linux-orig/drivers/sound/Config.in linux/drivers/sound/Config.in
diff -urN linux-orig/drivers/ssi/Config.in linux/drivers/ssi/Config.in
diff -urN linux-orig/drivers/video/Config.in linux/drivers/video/Config.in

So you're probably removing some of the valid symbols in the defconfig
files. Without going through your changes with a toothpick...

--
Russell King ([email protected]) The developer of ARM Linux
http://www.arm.linux.org.uk/personal/aboutme.html

diff -urN linux-orig/arch/arm/def-configs/clps7500 linux/arch/arm/def-configs/clps7500
--- linux-orig/arch/arm/def-configs/clps7500 Tue Oct 3 20:08:18 2000
+++ linux/arch/arm/def-configs/clps7500 Tue Feb 13 15:26:10 2001
@@ -2,7 +2,9 @@
# Automatically generated make config: don't edit
#
CONFIG_ARM=y
+# CONFIG_EISA is not set
# CONFIG_SBUS is not set
+# CONFIG_MCA is not set
CONFIG_UID16=y

#
@@ -23,6 +25,7 @@
CONFIG_ARCH_CLPS7500=y
# CONFIG_ARCH_CO285 is not set
# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_L7200 is not set
# CONFIG_ARCH_FTVPCI is not set
# CONFIG_ARCH_TBOX is not set
# CONFIG_ARCH_SHARK is not set
@@ -30,22 +33,51 @@
# CONFIG_ARCH_INTEGRATOR is not set
# CONFIG_ARCH_RPC is not set
# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_CLPS711X is not set
+
+#
+# Archimedes/A5000 Implementations
+#
+
+#
+# Footbridge Implementations
+#
+
+#
+# SA11x0 Implementations
+#
+
+#
+# CLPS711X/EP721X Implementations
+#
# CONFIG_ARCH_ACORN is not set
# CONFIG_FOOTBRIDGE is not set
# CONFIG_FOOTBRIDGE_HOST is not set
# CONFIG_FOOTBRIDGE_ADDIN is not set
CONFIG_CPU_32=y
# CONFIG_CPU_26 is not set
+
+#
+# Processor Type
+#
CONFIG_CPU_32v3=y
-CONFIG_CPU_ARM7=y
+# CONFIG_CPU_32v4 is not set
+# CONFIG_CPU_ARM610 is not set
+CONFIG_CPU_ARM710=y
+# CONFIG_CPU_ARM720T is not set
+# CONFIG_CPU_ARM920T is not set
+# CONFIG_CPU_ARM1020 is not set
+# CONFIG_CPU_SA110 is not set
+# CONFIG_CPU_SA1100 is not set
# CONFIG_DISCONTIGMEM is not set
-# CONFIG_PCI is not set
-# CONFIG_ISA is not set
-# CONFIG_ISA_DMA is not set

#
# General setup
#
+CONFIG_ANGELBOOT=y
+# CONFIG_PCI is not set
+CONFIG_ISA=y
+# CONFIG_ISA_DMA is not set
# CONFIG_HOTPLUG is not set
# CONFIG_PCMCIA is not set
CONFIG_NET=y
@@ -60,7 +92,7 @@
# CONFIG_BINFMT_MISC is not set
# CONFIG_PM is not set
# CONFIG_ARTHUR is not set
-CONFIG_CMDLINE="root=/dev/nfs rw"
+CONFIG_CMDLINE="mem=16M root=nfs"
# CONFIG_ALIGNMENT_TRAP is not set

#
@@ -81,34 +113,35 @@
# Memory Technology Devices (MTD)
#
CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
# CONFIG_MTD_DOC1000 is not set
# CONFIG_MTD_DOC2000 is not set
# CONFIG_MTD_DOC2001 is not set
# CONFIG_MTD_DOCPROBE is not set
+
+#
+# RAM/ROM Device Drivers
+#
# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_PMC551_BUGFIX is not set
+# CONFIG_MTD_PMC551_DEBUG is not set
# CONFIG_MTD_MTDRAM is not set

#
-# MTD drivers for mapped chips
+# Linearly Mapped Flash Device Drivers
#
# CONFIG_MTD_CFI is not set
-# CONFIG_MTD_CFI_INTELEXT is not set
-# CONFIG_MTD_CFI_AMDSTD is not set
-# CONFIG_MTD_JEDEC is not set
# CONFIG_MTD_RAM is not set
# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_JEDEC is not set

#
# Drivers for chip mappings
#
-# CONFIG_MTD_MIXMEM is not set
-# CONFIG_MTD_NORA is not set
-# CONFIG_MTD_OCTAGON is not set
-# CONFIG_MTD_PNC2000 is not set
-# CONFIG_MTD_RPXLITE is not set
-# CONFIG_MTD_VMAX is not set

#
# User modules and translation layers for MTD devices
@@ -122,7 +155,6 @@
# Plug and Play configuration
#
# CONFIG_PNP is not set
-# CONFIG_ISAPNP is not set

#
# Block devices
@@ -130,20 +162,12 @@
# CONFIG_BLK_DEV_FD is not set
# CONFIG_BLK_DEV_XD is not set
# CONFIG_PARIDE is not set
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_DEV_DAC960 is not set
# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_LVM is not set
-# CONFIG_BLK_DEV_MD is not set
-# CONFIG_MD_LINEAR is not set
-# CONFIG_MD_RAID0 is not set
-# CONFIG_MD_RAID1 is not set
-# CONFIG_MD_RAID5 is not set
+CONFIG_BLK_DEV_NBD=y
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=4096
# CONFIG_BLK_DEV_INITRD is not set
-CONFIG_BLK_DEV_FLD7500=y
+# CONFIG_BLK_DEV_FLD7500 is not set

#
# Networking options
@@ -159,10 +183,8 @@
CONFIG_IP_PNP=y
CONFIG_IP_PNP_BOOTP=y
# CONFIG_IP_PNP_RARP is not set
-# CONFIG_IP_ROUTER is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_ALIAS is not set
# CONFIG_INET_ECN is not set
# CONFIG_SYN_COOKIES is not set
# CONFIG_IPV6 is not set
@@ -179,6 +201,7 @@
# CONFIG_X25 is not set
# CONFIG_LAPB is not set
# CONFIG_LLC is not set
+# CONFIG_NET_DIVERT is not set
# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
# CONFIG_NET_FASTROUTE is not set
@@ -201,6 +224,7 @@
CONFIG_DUMMY=y
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
# CONFIG_NET_SB1000 is not set

#
@@ -213,16 +237,19 @@
# 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_NET_PCI=y
+# CONFIG_AC3200 is not set
+# CONFIG_APRICOT is not set
+CONFIG_CS89x0=y
+# CONFIG_ZNET is not set
# CONFIG_NET_POCKET is not set

#
# Ethernet (1000 Mbit)
#
-# CONFIG_YELLOWFIN is not set
-# CONFIG_ACENIC is not set
-# CONFIG_SK98LIN is not set
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
# CONFIG_PLIP is not set
@@ -283,10 +310,6 @@
# I2O device support
#
# CONFIG_I2O is not set
-# CONFIG_I2O_BLOCK is not set
-# CONFIG_I2O_LAN is not set
-# CONFIG_I2O_SCSI is not set
-# CONFIG_I2O_PROC is not set

#
# ISDN subsystem
@@ -294,6 +317,11 @@
# CONFIG_ISDN is not set

#
+# Input core support
+#
+# CONFIG_INPUT is not set
+
+#
# Character devices
#
CONFIG_VT=y
@@ -305,7 +333,7 @@
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
CONFIG_PRINTER=y
-CONFIG_LP_CONSOLE=y
+# CONFIG_LP_CONSOLE is not set
# CONFIG_PPDEV is not set

#
@@ -322,16 +350,38 @@
#
# Mice
#
-# CONFIG_BUSMOUSE is not set
+CONFIG_BUSMOUSE=y
+# CONFIG_ATIXL_BUSMOUSE is not set
+# CONFIG_LOGIBUSMOUSE is not set
+# CONFIG_MS_BUSMOUSE is not set
CONFIG_MOUSE=y
-CONFIG_PSMOUSE=y
+# CONFIG_PSMOUSE is not set
# CONFIG_82C710_MOUSE is not set
# CONFIG_PC110_PAD is not set

#
# Joysticks
#
-# CONFIG_JOYSTICK is not set
+
+#
+# Game port support
+#
+
+#
+# Gameport joysticks
+#
+
+#
+# Serial port support
+#
+
+#
+# Serial port joysticks
+#
+
+#
+# Parallel port joysticks
+#
# CONFIG_QIC02_TAPE is not set

#
@@ -341,11 +391,6 @@
CONFIG_CLPS7500_FLASH=y
# CONFIG_NVRAM is not set
# CONFIG_RTC is not set
-
-#
-# Video For Linux
-#
-# CONFIG_VIDEO_DEV is not set
# CONFIG_DTLK is not set
# CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set
@@ -353,45 +398,38 @@
# CONFIG_DRM is not set

#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
# File systems
#
# CONFIG_QUOTA is not set
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUTOFS4_FS is not set
# CONFIG_ADFS_FS is not set
-# CONFIG_ADFS_FS_RW is not set
# CONFIG_AFFS_FS is not set
# CONFIG_HFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_FAT_FS is not set
-# CONFIG_MSDOS_FS is not set
-# CONFIG_UMSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
# CONFIG_EFS_FS is not set
# CONFIG_JFFS_FS is not set
# CONFIG_CRAMFS is not set
# CONFIG_RAMFS is not set
# CONFIG_ISO9660_FS is not set
-# CONFIG_JOLIET is not set
CONFIG_MINIX_FS=y
# CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
# CONFIG_HPFS_FS is not set
CONFIG_PROC_FS=y
# CONFIG_DEVFS_FS is not set
-# CONFIG_DEVFS_MOUNT is not set
-# CONFIG_DEVFS_DEBUG is not set
-# CONFIG_DEVPTS_FS is not set
+CONFIG_DEVPTS_FS=y
# CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX4FS_RW is not set
# CONFIG_ROMFS_FS is not set
CONFIG_EXT2_FS=y
# CONFIG_SYSV_FS is not set
-# CONFIG_SYSV_FS_WRITE is not set
# CONFIG_UDF_FS is not set
-# CONFIG_UDF_RW is not set
# CONFIG_UFS_FS is not set
-# CONFIG_UFS_FS_WRITE is not set

#
# Network File Systems
@@ -401,21 +439,10 @@
# CONFIG_NFS_V3 is not set
CONFIG_ROOT_NFS=y
# CONFIG_NFSD is not set
-# CONFIG_NFSD_V3 is not set
CONFIG_SUNRPC=y
CONFIG_LOCKD=y
# CONFIG_SMB_FS is not set
# CONFIG_NCP_FS is not set
-# CONFIG_NCPFS_PACKET_SIGNING is not set
-# CONFIG_NCPFS_IOCTL_LOCKING is not set
-# CONFIG_NCPFS_STRONG is not set
-# CONFIG_NCPFS_NFS_NS is not set
-# CONFIG_NCPFS_OS2_NS is not set
-# CONFIG_NCPFS_SMALLDOS is not set
-# CONFIG_NCPFS_MOUNT_SUBDIR is not set
-# CONFIG_NCPFS_NDS_DOMAINS is not set
-# CONFIG_NCPFS_NLS is not set
-# CONFIG_NCPFS_EXTRAS is not set

#
# Partition Types
@@ -430,11 +457,14 @@
# CONFIG_SGI_PARTITION is not set
# CONFIG_ULTRIX_PARTITION is not set
# CONFIG_SUN_PARTITION is not set
+# CONFIG_SMB_NLS is not set
# CONFIG_NLS is not set

#
# Console drivers
#
+CONFIG_PC_KEYB=y
+CONFIG_PC_KEYMAP=y
# CONFIG_VGA_CONSOLE is not set
CONFIG_FB=y

@@ -445,15 +475,14 @@
CONFIG_DUMMY_CONSOLE=y
CONFIG_FB_ACORN=y
# CONFIG_CHRONTEL_7003 is not set
-# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_VIRTUAL is not set
CONFIG_FBCON_ADVANCED=y
-# CONFIG_FBCON_MFB is not set
-# CONFIG_FBCON_CFB2 is not set
-# CONFIG_FBCON_CFB4 is not set
+CONFIG_FBCON_MFB=y
+CONFIG_FBCON_CFB2=y
+CONFIG_FBCON_CFB4=y
CONFIG_FBCON_CFB8=y
-# CONFIG_FBCON_CFB16 is not set
-# CONFIG_FBCON_CFB24 is not set
+CONFIG_FBCON_CFB16=y
+CONFIG_FBCON_CFB24=y
# CONFIG_FBCON_CFB32 is not set
# CONFIG_FBCON_AFB is not set
# CONFIG_FBCON_ILBM is not set
@@ -487,4 +516,4 @@
# CONFIG_DEBUG_USER is not set
# CONFIG_DEBUG_INFO is not set
CONFIG_MAGIC_SYSRQ=y
-# CONFIG_DEBUG_LL is not set
+CONFIG_DEBUG_LL=y
diff -urN linux-orig/arch/arm/def-configs/integrator linux/arch/arm/def-configs/integrator
--- linux-orig/arch/arm/def-configs/integrator Tue Dec 12 23:59:48 2000
+++ linux/arch/arm/def-configs/integrator Tue Jan 30 16:05:03 2001
@@ -25,6 +25,7 @@
# CONFIG_ARCH_CLPS7500 is not set
# CONFIG_ARCH_CO285 is not set
# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_L7200 is not set
# CONFIG_ARCH_FOOTBRIDGE is not set
CONFIG_ARCH_INTEGRATOR=y
# CONFIG_ARCH_RPC is not set
@@ -56,18 +57,28 @@
#
# Processor Type
#
+# CONFIG_CPU_32v3 is not set
CONFIG_CPU_32v4=y
-CONFIG_CPU_ARM720=y
-CONFIG_CPU_ARM920=y
+# CONFIG_CPU_ARM610 is not set
+# CONFIG_CPU_ARM710 is not set
+CONFIG_CPU_ARM720T=y
+CONFIG_CPU_ARM920T=y
CONFIG_CPU_ARM920_CPU_IDLE=y
CONFIG_CPU_ARM920_I_CACHE_ON=y
CONFIG_CPU_ARM920_D_CACHE_ON=y
# CONFIG_CPU_ARM920_WRITETHROUGH is not set
+# CONFIG_CPU_ARM1020 is not set
+# CONFIG_CPU_SA110 is not set
+# CONFIG_CPU_SA1100 is not set
# CONFIG_DISCONTIGMEM is not set

#
# General setup
#
+
+#
+# Please ensure that you have read the help on the next option
+#
# CONFIG_ANGELBOOT is not set
CONFIG_PCI_INTEGRATOR=y
CONFIG_PCI=y
@@ -103,23 +114,32 @@
# Memory Technology Devices (MTD)
#
CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
# CONFIG_MTD_DOC1000 is not set
# CONFIG_MTD_DOC2000 is not set
# CONFIG_MTD_DOC2001 is not set
# CONFIG_MTD_DOCPROBE is not set
+
+#
+# RAM/ROM Device Drivers
+#
# CONFIG_MTD_SLRAM is not set
# CONFIG_MTD_PMC551 is not set
# CONFIG_MTD_MTDRAM is not set

#
-# MTD drivers for mapped chips
+# Linearly Mapped Flash Device Drivers
#
CONFIG_MTD_CFI=y
CONFIG_MTD_CFI_INTELEXT=y
# CONFIG_MTD_CFI_AMDSTD is not set
-# CONFIG_MTD_JEDEC is not set
# CONFIG_MTD_RAM is not set
# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_JEDEC is not set
# CONFIG_MTD_PHYSMAP is not set

#
@@ -347,6 +367,8 @@
CONFIG_SERIAL_AMBA=y
CONFIG_SERIAL_INTEGRATOR=y
CONFIG_SERIAL_AMBA_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256

@@ -403,6 +425,8 @@
# CONFIG_QUOTA is not set
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUTOFS4_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_REISERFS_CHECK is not set
# CONFIG_ADFS_FS is not set
# CONFIG_ADFS_FS_RW is not set
# CONFIG_AFFS_FS is not set
@@ -457,8 +481,6 @@
# CONFIG_NCPFS_NFS_NS is not set
# CONFIG_NCPFS_OS2_NS is not set
# CONFIG_NCPFS_SMALLDOS is not set
-# CONFIG_NCPFS_MOUNT_SUBDIR is not set
-# CONFIG_NCPFS_NDS_DOMAINS is not set
# CONFIG_NCPFS_NLS is not set
# CONFIG_NCPFS_EXTRAS is not set

@@ -475,6 +497,7 @@
# CONFIG_SGI_PARTITION is not set
# CONFIG_ULTRIX_PARTITION is not set
# CONFIG_SUN_PARTITION is not set
+# CONFIG_SMB_NLS is not set
# CONFIG_NLS is not set

#
@@ -503,7 +526,7 @@
#
# Kernel hacking
#
-CONFIG_FRAME_POINTER=y
+# CONFIG_NO_FRAME_POINTER is not set
CONFIG_DEBUG_ERRORS=y
CONFIG_DEBUG_USER=y
# CONFIG_DEBUG_INFO is not set
diff -urN linux-orig/arch/arm/defconfig linux/arch/arm/defconfig
--- linux-orig/arch/arm/defconfig Wed May 31 13:12:12 2000
+++ linux/arch/arm/defconfig Tue Jan 30 16:04:09 2001
@@ -2,50 +2,80 @@
# Automatically generated make config: don't edit
#
CONFIG_ARM=y
+# CONFIG_EISA is not set
+# CONFIG_SBUS is not set
+# CONFIG_MCA is not set
CONFIG_UID16=y

#
# Code maturity level options
#
CONFIG_EXPERIMENTAL=y
+# CONFIG_OBSOLETE is not set

#
-# System and processor type
+# Loadable module support
#
-# CONFIG_ARCH_ARC is not set
-# CONFIG_ARCH_A5K is not set
-# CONFIG_ARCH_RPC is not set
+# CONFIG_MODULES is not set
+
+#
+# System Type
+#
+# CONFIG_ARCH_ARCA5K is not set
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CO285 is not set
# CONFIG_ARCH_EBSA110 is not set
-CONFIG_FOOTBRIDGE=y
-CONFIG_HOST_FOOTBRIDGE=y
-# CONFIG_ADDIN_FOOTBRIDGE is not set
-CONFIG_ARCH_EBSA285=y
-# CONFIG_ARCH_CATS is not set
-CONFIG_ARCH_NETWINDER=y
-# CONFIG_ARCH_PERSONAL_SERVER is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+CONFIG_ARCH_INTEGRATOR=y
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_CLPS711X is not set
+
+#
+# Archimedes/A5000 Implementations
+#
+
+#
+# Footbridge Implementations
+#
+
+#
+# SA11x0 Implementations
+#
+
+#
+# CLPS711X/EP721X Implementations
+#
# CONFIG_ARCH_ACORN is not set
+# CONFIG_FOOTBRIDGE is not set
+# CONFIG_FOOTBRIDGE_HOST is not set
+# CONFIG_FOOTBRIDGE_ADDIN is not set
CONFIG_CPU_32=y
# CONFIG_CPU_26 is not set
-CONFIG_CPU_32v4=y
-CONFIG_CPU_SA110=y
-CONFIG_PCI=y
-CONFIG_PCI_NAMES=y
-CONFIG_ISA=y
-CONFIG_ISA_DMA=y
-# CONFIG_SBUS is not set
-# CONFIG_PCMCIA is not set
-# CONFIG_ALIGNMENT_TRAP is not set

#
-# Loadable module support
+# Processor Type
#
-CONFIG_MODULES=y
-# CONFIG_MODVERSIONS is not set
-CONFIG_KMOD=y
+CONFIG_CPU_32v4=y
+CONFIG_CPU_ARM720=y
+CONFIG_CPU_ARM920=y
+CONFIG_CPU_ARM920_CPU_IDLE=y
+CONFIG_CPU_ARM920_I_CACHE_ON=y
+CONFIG_CPU_ARM920_D_CACHE_ON=y
+# CONFIG_CPU_ARM920_WRITETHROUGH is not set
+# CONFIG_DISCONTIGMEM is not set

#
# General setup
#
+# CONFIG_ANGELBOOT is not set
+CONFIG_PCI_INTEGRATOR=y
+CONFIG_PCI=y
+# CONFIG_ISA is not set
+# CONFIG_ISA_DMA is not set
+CONFIG_PCI_NAMES=y
+# CONFIG_HOTPLUG is not set
+# CONFIG_PCMCIA is not set
CONFIG_NET=y
CONFIG_SYSVIPC=y
# CONFIG_BSD_PROCESS_ACCT is not set
@@ -56,296 +86,86 @@
CONFIG_BINFMT_AOUT=y
CONFIG_BINFMT_ELF=y
# CONFIG_BINFMT_MISC is not set
+# CONFIG_PM is not set
# CONFIG_ARTHUR is not set
+CONFIG_CMDLINE="root=1f04 mem=32M"
+CONFIG_LEDS=y
+CONFIG_LEDS_TIMER=y
+CONFIG_LEDS_CPU=y
+CONFIG_ALIGNMENT_TRAP=y

#
# Parallel port support
#
-CONFIG_PARPORT=y
-CONFIG_PARPORT_PC=y
-CONFIG_PARPORT_PC_FIFO=y
-# CONFIG_PARPORT_PC_SUPERIO is not set
-# CONFIG_PARPORT_ARC is not set
-# CONFIG_PARPORT_AMIGA is not set
-# CONFIG_PARPORT_MFC3 is not set
-# CONFIG_PARPORT_ATARI is not set
-# CONFIG_PARPORT_SUNBPP is not set
-# CONFIG_PARPORT_OTHER is not set
-CONFIG_PARPORT_1284=y
-CONFIG_CMDLINE="root=/dev/hda1 ro mem=32M parport=0x378,7 ide0=autotune"
-CONFIG_LEDS=y
-CONFIG_LEDS_TIMER=y
-# CONFIG_LEDS_CPU is not set
+# CONFIG_PARPORT is not set

#
-# IEEE 1394 (FireWire) support
+# Memory Technology Devices (MTD)
#
-# CONFIG_IEEE1394 is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DOC1000 is not set
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOCPROBE is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_MTDRAM is not set

#
-# I2O device support
+# MTD drivers for mapped chips
#
-# CONFIG_I2O is not set
-# CONFIG_I2O_PCI is not set
-# CONFIG_I2O_BLOCK is not set
-# CONFIG_I2O_LAN is not set
-# CONFIG_I2O_SCSI is not set
-# CONFIG_I2O_PROC is not set
+CONFIG_MTD_CFI=y
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_JEDEC is not set
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_PHYSMAP is not set
+
+#
+# Drivers for chip mappings
+#
+# CONFIG_MTD_MIXMEM is not set
+# CONFIG_MTD_NORA is not set
+# CONFIG_MTD_OCTAGON is not set
+# CONFIG_MTD_PNC2000 is not set
+# CONFIG_MTD_RPXLITE is not set
+# CONFIG_MTD_VMAX is not set
+
+#
+# User modules and translation layers for MTD devices
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+CONFIG_MTD_ARM=y

#
# Plug and Play configuration
#
-CONFIG_PNP=y
-CONFIG_ISAPNP=y
+# CONFIG_PNP is not set
+# CONFIG_ISAPNP is not set

#
# Block devices
#
# CONFIG_BLK_DEV_FD is not set
# CONFIG_BLK_DEV_XD is not set
-CONFIG_PARIDE=m
-CONFIG_PARIDE_PARPORT=y
-
-#
-# Parallel IDE high-level drivers
-#
-CONFIG_PARIDE_PD=m
-CONFIG_PARIDE_PCD=m
-CONFIG_PARIDE_PF=m
-CONFIG_PARIDE_PT=m
-CONFIG_PARIDE_PG=m
-
-#
-# Parallel IDE protocol modules
-#
-CONFIG_PARIDE_ATEN=m
-CONFIG_PARIDE_BPCK=m
-CONFIG_PARIDE_COMM=m
-CONFIG_PARIDE_DSTR=m
-CONFIG_PARIDE_FIT2=m
-CONFIG_PARIDE_FIT3=m
-CONFIG_PARIDE_EPAT=m
-CONFIG_PARIDE_EPIA=m
-CONFIG_PARIDE_FRIQ=m
-CONFIG_PARIDE_FRPW=m
-CONFIG_PARIDE_KBIC=m
-CONFIG_PARIDE_KTTI=m
-CONFIG_PARIDE_ON20=m
-CONFIG_PARIDE_ON26=m
+# CONFIG_PARIDE is not set
# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
# CONFIG_BLK_DEV_DAC960 is not set
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_MD=y
-CONFIG_MD_LINEAR=m
-CONFIG_MD_STRIPED=m
+# CONFIG_BLK_DEV_LOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=4096
# CONFIG_BLK_DEV_INITRD is not set

#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_SERIAL=y
-CONFIG_SERIAL_CONSOLE=y
-# CONFIG_SERIAL_EXTENDED is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX98_PTY_COUNT=256
-CONFIG_PRINTER=m
-# CONFIG_LP_CONSOLE is not set
-# CONFIG_PPDEV is not set
-
-#
-# I2C support
-#
-# CONFIG_I2C is not set
-
-#
-# Mice
-#
-# CONFIG_BUSMOUSE is not set
-CONFIG_MOUSE=y
-CONFIG_PSMOUSE=y
-# CONFIG_82C710_MOUSE is not set
-# CONFIG_PC110_PAD is not set
-
-#
-# Joysticks
-#
-# CONFIG_JOYSTICK is not set
-# CONFIG_QIC02_TAPE is not set
-
-#
-# Watchdog Cards
-#
-CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-# CONFIG_WDT is not set
-CONFIG_SOFT_WATCHDOG=y
-# CONFIG_PCWATCHDOG is not set
-# CONFIG_ACQUIRE_WDT is not set
-# CONFIG_MIXCOMWD is not set
-# CONFIG_21285_WATCHDOG is not set
-CONFIG_977_WATCHDOG=m
-CONFIG_DS1620=y
-CONFIG_NWBUTTON=y
-CONFIG_NWBUTTON_REBOOT=y
-CONFIG_NWFLASH=m
-# CONFIG_NVRAM is not set
-CONFIG_RTC=y
-
-#
-# Video For Linux
-#
-CONFIG_VIDEO_DEV=y
-# CONFIG_I2C_PARPORT is not set
-
-#
-# Radio Adapters
-#
-# CONFIG_RADIO_CADET is not set
-# CONFIG_RADIO_RTRACK is not set
-# CONFIG_RADIO_RTRACK2 is not set
-# CONFIG_RADIO_AZTECH is not set
-# CONFIG_RADIO_GEMTEK is not set
-# CONFIG_RADIO_MIROPCM20 is not set
-# CONFIG_RADIO_SF16FMI is not set
-# CONFIG_RADIO_TERRATEC is not set
-# CONFIG_RADIO_TRUST is not set
-# CONFIG_RADIO_TYPHOON is not set
-# CONFIG_RADIO_ZOLTRIX is not set
-
-#
-# Video Adapters
-#
-# CONFIG_VIDEO_PMS is not set
-# CONFIG_VIDEO_BWQCAM is not set
-# CONFIG_VIDEO_CQCAM is not set
-# CONFIG_VIDEO_SAA5249 is not set
-# CONFIG_TUNER_3036 is not set
-# CONFIG_VIDEO_STRADIS is not set
-# CONFIG_VIDEO_ZORAN is not set
-# CONFIG_VIDEO_BUZ is not set
-# CONFIG_VIDEO_ZR36120 is not set
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set
-# CONFIG_APPLICOM is not set
-
-#
-# Ftape, the floppy tape device driver
-#
-# CONFIG_FTAPE is not set
-# CONFIG_DRM is not set
-# CONFIG_DRM_TDFX is not set
-# CONFIG_AGP is not set
-
-#
-# USB support
-#
-CONFIG_USB=m
-
-#
-# USB Controllers
-#
-# CONFIG_USB_UHCI is not set
-# CONFIG_USB_UHCI_ALT is not set
-CONFIG_USB_OHCI=m
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEVICEFS=y
-
-#
-# USB Devices
-#
-CONFIG_USB_PRINTER=m
-# CONFIG_USB_SCANNER is not set
-CONFIG_USB_AUDIO=m
-CONFIG_USB_ACM=m
-# CONFIG_USB_SERIAL is not set
-# CONFIG_USB_CPIA is not set
-# CONFIG_USB_IBMCAM is not set
-# CONFIG_USB_OV511 is not set
-# CONFIG_USB_DC2XX is not set
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_STORAGE is not set
-# CONFIG_USB_USS720 is not set
-# CONFIG_USB_DABUSB is not set
-# CONFIG_USB_PLUSB is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RIO500 is not set
-# CONFIG_USB_DSBR is not set
-
-#
-# USB HID
-#
-# CONFIG_USB_HID is not set
-CONFIG_USB_KBD=m
-CONFIG_USB_MOUSE=m
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_WMFORCE is not set
-CONFIG_INPUT_KEYBDEV=m
-CONFIG_INPUT_MOUSEDEV=m
-CONFIG_INPUT_MOUSEDEV_MIX=y
-# CONFIG_INPUT_MOUSEDEV_DIGITIZER is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-
-#
-# Console drivers
-#
-CONFIG_VGA_CONSOLE=y
-CONFIG_FB=y
-
-#
-# Frame-buffer support
-#
-CONFIG_FB=y
-CONFIG_DUMMY_CONSOLE=y
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_CLGEN is not set
-# CONFIG_FB_PM2 is not set
-CONFIG_FB_CYBER2000=y
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_FBCON_ADVANCED=y
-# CONFIG_FBCON_MFB is not set
-# CONFIG_FBCON_CFB2 is not set
-# CONFIG_FBCON_CFB4 is not set
-CONFIG_FBCON_CFB8=y
-CONFIG_FBCON_CFB16=y
-CONFIG_FBCON_CFB24=y
-# CONFIG_FBCON_CFB32 is not set
-# CONFIG_FBCON_AFB is not set
-# CONFIG_FBCON_ILBM is not set
-# CONFIG_FBCON_IPLAN2P2 is not set
-# CONFIG_FBCON_IPLAN2P4 is not set
-# CONFIG_FBCON_IPLAN2P8 is not set
-# CONFIG_FBCON_MAC is not set
-# CONFIG_FBCON_VGA_PLANES is not set
-CONFIG_FBCON_VGA=y
-# CONFIG_FBCON_HGA is not set
-# CONFIG_FBCON_FONTWIDTH8_ONLY is not set
-CONFIG_FBCON_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-CONFIG_FONT_ACORN_8x8=y
-
-#
# Networking options
#
-CONFIG_PACKET=y
-# CONFIG_PACKET_MMAP is not set
+# CONFIG_PACKET is not set
# CONFIG_NETLINK is not set
# CONFIG_NETFILTER is not set
# CONFIG_FILTER is not set
@@ -356,16 +176,10 @@
CONFIG_IP_PNP=y
CONFIG_IP_PNP_BOOTP=y
# CONFIG_IP_PNP_RARP is not set
-# CONFIG_IP_ROUTER is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
-CONFIG_IP_ALIAS=y
+# CONFIG_INET_ECN is not set
# CONFIG_SYN_COOKIES is not set
-
-#
-# (it is safe to leave these untouched)
-#
-CONFIG_SKB_LARGE=y
# CONFIG_IPV6 is not set
# CONFIG_KHTTPD is not set
# CONFIG_ATM is not set
@@ -376,10 +190,11 @@
# CONFIG_IPX is not set
# CONFIG_ATALK is not set
# CONFIG_DECNET is not set
+# CONFIG_BRIDGE is not set
# CONFIG_X25 is not set
# CONFIG_LAPB is not set
-# CONFIG_BRIDGE is not set
# CONFIG_LLC is not set
+# CONFIG_NET_DIVERT is not set
# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
# CONFIG_NET_FASTROUTE is not set
@@ -391,16 +206,6 @@
# CONFIG_NET_SCHED is not set

#
-# Amateur Radio support
-#
-# CONFIG_HAMRADIO is not set
-
-#
-# IrDA (infrared) support
-#
-# CONFIG_IRDA is not set
-
-#
# Network device support
#
CONFIG_NETDEVICES=y
@@ -412,68 +217,59 @@
# CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
# CONFIG_NET_SB1000 is not set

#
# Ethernet (10 or 100Mbit)
#
CONFIG_NET_ETHERNET=y
-# CONFIG_ARM_AM79C961A is not set
-CONFIG_NET_VENDOR_3COM=y
-# CONFIG_EL1 is not set
-# CONFIG_EL2 is not set
-# CONFIG_ELPLUS is not set
-# CONFIG_EL16 is not set
-# CONFIG_EL3 is not set
-# CONFIG_3C515 is not set
-CONFIG_VORTEX=y
+# CONFIG_NET_VENDOR_3COM is not set
# CONFIG_LANCE 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=y
# CONFIG_PCNET32 is not set
# CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_AC3200 is not set
# CONFIG_APRICOT is not set
# CONFIG_CS89x0 is not set
+CONFIG_TULIP=y
# CONFIG_DE4X5 is not set
-CONFIG_TULIP=m
# CONFIG_DGRS is not set
# CONFIG_DM9102 is not set
-# CONFIG_EEPRO100 is not set
+CONFIG_EEPRO100=y
+CONFIG_EEPRO100_PM=y
# CONFIG_LNE390 is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
# CONFIG_NE3210 is not set
-CONFIG_NE2K_PCI=y
-# CONFIG_RTL8129 is not set
+# CONFIG_ES3210 is not set
# CONFIG_8139TOO is not set
+# CONFIG_RTL8129 is not set
# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
# CONFIG_TLAN is not set
# CONFIG_VIA_RHINE is not set
-# CONFIG_ES3210 is not set
-# CONFIG_EPIC100 is not set
+# CONFIG_WINBOND_840 is not set
+# CONFIG_HAPPYMEAL is not set
# CONFIG_NET_POCKET is not set

#
# Ethernet (1000 Mbit)
#
-# CONFIG_YELLOWFIN is not set
# CONFIG_ACENIC is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
# CONFIG_SK98LIN is not set
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
-# CONFIG_PLIP is not set
-CONFIG_PPP=m
-CONFIG_PPP_ASYNC=m
-# CONFIG_PPP_SYNC_TTY is not set
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_SLIP=m
-CONFIG_SLIP_COMPRESSED=y
-CONFIG_SLIP_SMART=y
-CONFIG_SLIP_MODE_SLIP6=y
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set

#
# Wireless LAN (non-hamradio)
@@ -494,71 +290,21 @@
# CONFIG_WAN is not set

#
-# ATA/IDE/MFM/RLL support
+# Amateur Radio support
#
-CONFIG_IDE=y
+# CONFIG_HAMRADIO is not set

#
-# IDE, ATA and ATAPI Block devices
+# IrDA (infrared) support
#
-CONFIG_BLK_DEV_IDE=y
+# CONFIG_IRDA is not set

#
-# Please see Documentation/ide.txt for help/info on IDE drives
+# ATA/IDE/MFM/RLL support
#
-# CONFIG_BLK_DEV_HD_IDE is not set
+# CONFIG_IDE is not set
+# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
-CONFIG_BLK_DEV_IDEDISK=y
-CONFIG_IDEDISK_MULTI_MODE=y
-# CONFIG_BLK_DEV_IDECS is not set
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_BLK_DEV_IDESCSI is not set
-
-#
-# IDE chipset support/bugfixes
-#
-# CONFIG_BLK_DEV_CMD640 is not set
-# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-# CONFIG_BLK_DEV_ISAPNP is not set
-# CONFIG_BLK_DEV_RZ1000 is not set
-CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_IDEPCI_SHARE_IRQ is not set
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-CONFIG_BLK_DEV_OFFBOARD=y
-CONFIG_IDEDMA_PCI_AUTO=y
-CONFIG_BLK_DEV_IDEDMA=y
-CONFIG_IDEDMA_PCI_EXPERIMENTAL=y
-# CONFIG_IDEDMA_PCI_WIP is not set
-# CONFIG_IDEDMA_NEW_DRIVE_LISTINGS is not set
-# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_AEC62XX_TUNING is not set
-# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_WDC_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD7409 is not set
-# CONFIG_AMD7409_OVERRIDE is not set
-# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_CMD64X_RAID is not set
-CONFIG_BLK_DEV_CY82C693=y
-# CONFIG_BLK_DEV_CS5530 is not set
-# CONFIG_BLK_DEV_HPT34X is not set
-# CONFIG_HPT34X_AUTODMA is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_HPT366_FIP is not set
-# CONFIG_HPT366_MODE3 is not set
-# CONFIG_BLK_DEV_NS87415 is not set
-# CONFIG_BLK_DEV_OPTI621 is not set
-CONFIG_BLK_DEV_PDC202XX=y
-# CONFIG_PDC202XX_BURST is not set
-# CONFIG_PDC202XX_MASTER is not set
-# CONFIG_BLK_DEV_SIS5513 is not set
-# CONFIG_BLK_DEV_TRM290 is not set
-# CONFIG_BLK_DEV_VIA82CXXX is not set
-CONFIG_BLK_DEV_SL82C105=y
-# CONFIG_IDE_CHIPSETS is not set
-CONFIG_IDEDMA_AUTO=y
-CONFIG_BLK_DEV_IDE_MODES=y

#
# SCSI support
@@ -566,72 +312,115 @@
# CONFIG_SCSI is not set

#
-# Sound
+# IEEE 1394 (FireWire) support
#
-CONFIG_SOUND=m
-# CONFIG_SOUND_CMPCI is not set
-# CONFIG_SOUND_ES1370 is not set
-# CONFIG_SOUND_ES1371 is not set
-# CONFIG_SOUND_ESSSOLO1 is not set
-# CONFIG_SOUND_MAESTRO is not set
-# CONFIG_SOUND_SONICVIBES is not set
-# CONFIG_SOUND_TRIDENT is not set
-# CONFIG_SOUND_MSNDCLAS is not set
-# CONFIG_SOUND_MSNDPIN is not set
-CONFIG_SOUND_OSS=m
-# CONFIG_SOUND_TRACEINIT is not set
-# CONFIG_SOUND_DMAP is not set
-# CONFIG_SOUND_AD1816 is not set
-# CONFIG_SOUND_SGALAXY is not set
-# CONFIG_SOUND_ADLIB is not set
-# CONFIG_SOUND_ACI_MIXER is not set
-# CONFIG_SOUND_CS4232 is not set
-# CONFIG_SOUND_SSCAPE is not set
-# CONFIG_SOUND_GUS is not set
-# CONFIG_SOUND_VMIDI is not set
-# CONFIG_SOUND_TRIX is not set
-# CONFIG_SOUND_MSS is not set
-# CONFIG_SOUND_MPU401 is not set
-# CONFIG_SOUND_NM256 is not set
-# CONFIG_SOUND_MAD16 is not set
-# CONFIG_SOUND_PAS is not set
-# CONFIG_PAS_JOYSTICK is not set
-# CONFIG_SOUND_PSS is not set
-# CONFIG_SOUND_SOFTOSS is not set
-CONFIG_SOUND_SB=m
-# CONFIG_SOUND_AWE32_SYNTH is not set
-# CONFIG_SOUND_WAVEFRONT is not set
-# CONFIG_SOUND_MAUI is not set
-# CONFIG_SOUND_VIA82CXXX is not set
-# CONFIG_SOUND_YM3812 is not set
-# CONFIG_SOUND_OPL3SA1 is not set
-# CONFIG_SOUND_OPL3SA2 is not set
-# CONFIG_SOUND_UART6850 is not set
-# CONFIG_SOUND_AEDSP16 is not set
-# CONFIG_SOUND_VIDC is not set
-CONFIG_SOUND_WAVEARTIST=m
+# CONFIG_IEEE1394 is not set
+
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+# CONFIG_I2O_PCI is not set
+# CONFIG_I2O_BLOCK is not set
+# CONFIG_I2O_LAN is not set
+# CONFIG_I2O_SCSI is not set
+# CONFIG_I2O_PROC is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Input core support
+#
+# CONFIG_INPUT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+# CONFIG_SERIAL is not set
+# CONFIG_SERIAL_EXTENDED is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+CONFIG_SERIAL_AMBA=y
+CONFIG_SERIAL_INTEGRATOR=y
+CONFIG_SERIAL_AMBA_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_UNIX98_PTY_COUNT=256
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# Mice
+#
+# CONFIG_BUSMOUSE is not set
+CONFIG_MOUSE=y
+CONFIG_PSMOUSE=y
+# CONFIG_82C710_MOUSE is not set
+# CONFIG_PC110_PAD is not set
+
+#
+# Joysticks
+#
+# CONFIG_JOYSTICK is not set
+
+#
+# Input core support is needed for joysticks
+#
+# CONFIG_QIC02_TAPE is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_INTEL_RNG is not set
+# CONFIG_NVRAM is not set
+# CONFIG_RTC is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_FTAPE is not set
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set

#
# File systems
#
# CONFIG_QUOTA is not set
-CONFIG_AUTOFS_FS=y
+# CONFIG_AUTOFS_FS is not set
# CONFIG_AUTOFS4_FS is not set
-CONFIG_ADFS_FS=y
+# CONFIG_ADFS_FS is not set
# CONFIG_ADFS_FS_RW is not set
# CONFIG_AFFS_FS is not set
# CONFIG_HFS_FS is not set
# CONFIG_BFS_FS is not set
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
+# CONFIG_FAT_FS is not set
+# CONFIG_MSDOS_FS is not set
# CONFIG_UMSDOS_FS is not set
-CONFIG_VFAT_FS=m
+# CONFIG_VFAT_FS is not set
# CONFIG_EFS_FS is not set
+# CONFIG_JFFS_FS is not set
# CONFIG_CRAMFS is not set
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
+# CONFIG_RAMFS is not set
+# CONFIG_ISO9660_FS is not set
+# CONFIG_JOLIET is not set
# CONFIG_MINIX_FS is not set
# CONFIG_NTFS_FS is not set
+# CONFIG_NTFS_RW is not set
# CONFIG_HPFS_FS is not set
CONFIG_PROC_FS=y
# CONFIG_DEVFS_FS is not set
@@ -639,77 +428,77 @@
# CONFIG_DEVFS_DEBUG is not set
CONFIG_DEVPTS_FS=y
# CONFIG_QNX4FS_FS is not set
-# CONFIG_ROMFS_FS is not set
+# CONFIG_QNX4FS_RW is not set
+CONFIG_ROMFS_FS=y
CONFIG_EXT2_FS=y
# CONFIG_SYSV_FS is not set
+# CONFIG_SYSV_FS_WRITE is not set
# CONFIG_UDF_FS is not set
+# CONFIG_UDF_RW is not set
# CONFIG_UFS_FS is not set
+# CONFIG_UFS_FS_WRITE is not set

#
# Network File Systems
#
# CONFIG_CODA_FS is not set
CONFIG_NFS_FS=y
+# CONFIG_NFS_V3 is not set
CONFIG_ROOT_NFS=y
-CONFIG_NFSD=m
+# CONFIG_NFSD is not set
# CONFIG_NFSD_V3 is not set
CONFIG_SUNRPC=y
CONFIG_LOCKD=y
# CONFIG_SMB_FS is not set
# CONFIG_NCP_FS is not set
+# CONFIG_NCPFS_PACKET_SIGNING is not set
+# CONFIG_NCPFS_IOCTL_LOCKING is not set
+# CONFIG_NCPFS_STRONG is not set
+# CONFIG_NCPFS_NFS_NS is not set
+# CONFIG_NCPFS_OS2_NS is not set
+# CONFIG_NCPFS_SMALLDOS is not set
+# CONFIG_NCPFS_MOUNT_SUBDIR is not set
+# CONFIG_NCPFS_NDS_DOMAINS is not set
+# CONFIG_NCPFS_NLS is not set
+# CONFIG_NCPFS_EXTRAS is not set

#
# Partition Types
#
CONFIG_PARTITION_ADVANCED=y
-CONFIG_ACORN_PARTITION=y
-# CONFIG_ACORN_PARTITION_ICS is not set
-CONFIG_ACORN_PARTITION_ADFS=y
-# CONFIG_ACORN_PARTITION_POWERTEC is not set
-# CONFIG_ACORN_PARTITION_RISCIX is not set
+# CONFIG_ACORN_PARTITION is not set
# CONFIG_OSF_PARTITION is not set
# CONFIG_AMIGA_PARTITION is not set
# CONFIG_ATARI_PARTITION is not set
# CONFIG_MAC_PARTITION is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_MSDOS_PARTITION is not set
# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
# CONFIG_SUN_PARTITION is not set
-CONFIG_NLS=y
+# CONFIG_NLS is not set

#
-# Native Language Support
+# Console drivers
+#
+CONFIG_KMI_KEYB=y
+CONFIG_PC_KEYMAP=y
+CONFIG_VGA_CONSOLE=y
+# CONFIG_FB is not set
+
+#
+# Frame-buffer support
+#
+# CONFIG_FB is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# USB support
#
-CONFIG_NLS_CODEPAGE_437=m
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-CONFIG_NLS_ISO8859_15=m
-# CONFIG_NLS_KOI8_R is not set
+# CONFIG_USB is not set

#
# Kernel hacking
@@ -719,4 +508,4 @@
CONFIG_DEBUG_USER=y
# CONFIG_DEBUG_INFO is not set
CONFIG_MAGIC_SYSRQ=y
-# CONFIG_DEBUG_LL is not set
+CONFIG_DEBUG_LL=y

2001-04-19 21:06:50

by Kai Germaschewski

[permalink] [raw]
Subject: Re: [kbuild-devel] Dead symbol elimination, stage 1

On Thu, 19 Apr 2001, Eric S. Raymond wrote:

> The following patch cleans dead symbols out of the defconfigs in the 2.4.4pre4
> source tree. It corrects a typo involving CONFIG_GEN_RTC. Another typo
> involving CONFIG_SOUND_YMPCI doesn't need to be corrected, as the symbol
> is never set in these files.

While I think your work CONFIG_ cleanup is generally a good idea and will
remove a lot of cruft, I don't think the defconfigs are worth the effort
(but maybe I'm missing something).

First, they are only used as defaults, and any inconsistency should get
cleaned up before the user even sees it.

Second, removing dead entries is not all which is needed to get a
defconfig which is necessarily consistent. So if you want to have these,
why don't you do a

cp arch/$ARCH/defconfig .config
make oldconfig

AFAICS, this should remove old cruft and provide a .config (to be used as
defconfig) which is consistent with the current config.in's.


Anyway, I put together a patch which should clean up some issues which I
was reminded of because of your work in the ISDN subsystem. I appended it,
I hope the maintainer of the Eicon code (Armin) will clean up the missing
Configure.help entries for his drivers.

--Kai

diff -ur linux-2.4.4-pre4/Documentation/Configure.help linux-2.4.4-pre4.config/Documentation/Configure.help
--- linux-2.4.4-pre4/Documentation/Configure.help Thu Apr 19 21:49:17 2001
+++ linux-2.4.4-pre4.config/Documentation/Configure.help Thu Apr 19 23:00:40 2001
@@ -15430,6 +15430,16 @@
This enables HiSax support for the AMD7930 chips on some SPARCs.
This code is not finished yet.

+ELSA PCMCIA MicroLink cards
+CONFIG_HISAX_ELSA_CS
+ This enables the PCMCIA client driver for the Elsa PCMCIA MicroLink
+ card
+
+Sedlbauer PCMCIA cards
+CONFIG_HISAX_SEDLBAUER_CS $CONFIG_PCMCIA
+ This enables the PCMCIA client driver for the Sedlbauer Speed Star
+ and Speed Star II cards.
+
PCBIT-D support
CONFIG_ISDN_DRV_PCBIT
This enables support for the PCBIT ISDN-card. This card is
@@ -15503,6 +15513,33 @@
compile it as a module, say M here and read
Documentation/modules.txt.

+CAPI2.0 /dev/capi20 support
+CONFIG_ISDN_CAPI_CAPI20
+ This option will provide the CAPI 2.0 interface to userspace
+ applications via /dev/capi20. Applications should use the standardized
+ libcapi20 to access this functionality. You should say Y/M here.
+
+CAPI2.0 Middleware support
+CONFIG_ISDN_CAPI_MIDDLEWARE
+ This option will enhance the capabilities of the /dev/capi20 interface.
+ It will provide a means of moving a data connection, established
+ via the usual /dev/capi20 interface to a special tty device. If you want
+ to use pppd with pppdcapiplugin to dial up to your ISP, say Y here.
+
+CAPI2.0 filesystem support
+CONFIG_ISDN_CAPI_CAPIFS_BOOL
+ This option provides a special file system, similar to /dev/pts with
+ device nodes for the special ttys established by using the middleware
+ extension above. If you want to use pppd with pppdcapiplugin to dial up
+ to your ISP, say Y here.
+
+CAPI2.0 capidrv interface support
+CONFIG_ISDN_CAPI_CAPIDRV
+ This option provides the glue code to hook up CAPI driven cards to
+ the legacy isdn4linux link layer. If you have a card which is supported
+ by a CAPI driver, but still want to use old features like ippp
+ interfaces or ttyI emulation, say Y/M here.
+
AVM B1 ISA support
CONFIG_ISDN_DRV_AVMB1_B1ISA
Enable support for the ISA version of the AVM B1 card.
@@ -15523,6 +15560,11 @@
AVM B1/M1/M2 PCMCIA support
CONFIG_ISDN_DRV_AVMB1_B1PCMCIA
Enable support for the PCMCIA version of the AVM B1 card.
+
+AVM B1/M1/M2 PCMCIA cs module
+CONFIG_ISDN_DRV_AVMB1_AVM_CS
+ Enable the PCMCIA client driver for the AVM B1/M1/M2
+ PCMCIA cards.

AVM T1/T1-B PCI support
CONFIG_ISDN_DRV_AVMB1_T1PCI
diff -ur linux-2.4.4-pre4/drivers/isdn/Config.in linux-2.4.4-pre4.config/drivers/isdn/Config.in
--- linux-2.4.4-pre4/drivers/isdn/Config.in Thu Apr 19 21:49:37 2001
+++ linux-2.4.4-pre4.config/drivers/isdn/Config.in Thu Apr 19 22:49:07 2001
@@ -110,8 +110,8 @@
tristate 'CAPI2.0 support' CONFIG_ISDN_CAPI
if [ "$CONFIG_ISDN_CAPI" != "n" ]; then
bool ' Verbose reason code reporting (kernel size +=7K)' CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON
- dep_bool ' CAPI2.0 Middleware support (EXPERIMENTAL)' CONFIG_ISDN_CAPI_MIDDLEWARE $CONFIG_EXPERIMENTAL
dep_tristate ' CAPI2.0 /dev/capi support' CONFIG_ISDN_CAPI_CAPI20 $CONFIG_ISDN_CAPI
+ dep_mbool ' CAPI2.0 Middleware support (EXPERIMENTAL)' CONFIG_ISDN_CAPI_MIDDLEWARE $CONFIG_ISDN_CAPI_CAPI20 $CONFIG_EXPERIMENTAL
if [ "$CONFIG_ISDN_CAPI_MIDDLEWARE" = "y" ]; then
dep_mbool ' CAPI2.0 filesystem support' CONFIG_ISDN_CAPI_CAPIFS_BOOL $CONFIG_ISDN_CAPI_CAPI20
if [ "$CONFIG_ISDN_CAPI_CAPIFS_BOOL" = "y" ]; then
diff -ur linux-2.4.4-pre4/drivers/isdn/avmb1/b1dma.c linux-2.4.4-pre4.config/drivers/isdn/avmb1/b1dma.c
--- linux-2.4.4-pre4/drivers/isdn/avmb1/b1dma.c Fri Mar 30 10:40:56 2001
+++ linux-2.4.4-pre4.config/drivers/isdn/avmb1/b1dma.c Thu Apr 19 22:09:56 2001
@@ -71,6 +71,9 @@
#include "capicmd.h"
#include "capiutil.h"

+#undef B1DMA_DEBUG
+#undef B1DMA_POLLDEBUG
+
static char *revision = "$Revision: 1.11.6.3 $";

/* ------------------------------------------------------------- */
@@ -412,7 +415,7 @@

skb = skb_dequeue(&dma->send_queue);
if (!skb) {
-#ifdef CONFIG_B1DMA_DEBUG
+#ifdef B1DMA_DEBUG
printk(KERN_DEBUG "tx(%d): underrun\n", inint);
#endif
restore_flags(flags);
@@ -437,17 +440,17 @@
_put_slice(&p, skb->data, len);
}
txlen = (__u8 *)p - (__u8 *)dma->sendbuf;
-#ifdef CONFIG_B1DMA_DEBUG
+#ifdef B1DMA_DEBUG
printk(KERN_DEBUG "tx(%d): put msg len=%d\n",
inint, txlen);
#endif
} else {
txlen = skb->len-2;
-#ifdef CONFIG_B1DMA_POLLDEBUG
+#ifdef B1DMA_POLLDEBUG
if (skb->data[2] == SEND_POLLACK)
printk(KERN_INFO "%s: send ack\n", card->name);
#endif
-#ifdef CONFIG_B1DMA_DEBUG
+#ifdef B1DMA_DEBUG
printk(KERN_DEBUG "tx(%d): put 0x%x len=%d\n",
inint, skb->data[2], txlen);
#endif
@@ -502,7 +505,7 @@
__u32 ApplId, MsgLen, DataB3Len, NCCI, WindowSize;
__u8 b1cmd = _get_byte(&p);

-#ifdef CONFIG_B1DMA_DEBUG
+#ifdef B1DMA_DEBUG
printk(KERN_DEBUG "rx: 0x%x %lu\n", b1cmd, (unsigned long)dma->recvlen);
#endif

@@ -562,7 +565,7 @@
break;

case RECEIVE_START:
-#ifdef CONFIG_B1DMA_POLLDEBUG
+#ifdef B1DMA_POLLDEBUG
printk(KERN_INFO "%s: receive poll\n", card->name);
#endif
if (!suppress_pollack)
diff -ur linux-2.4.4-pre4/drivers/isdn/avmb1/c4.c linux-2.4.4-pre4.config/drivers/isdn/avmb1/c4.c
--- linux-2.4.4-pre4/drivers/isdn/avmb1/c4.c Fri Mar 30 10:40:56 2001
+++ linux-2.4.4-pre4.config/drivers/isdn/avmb1/c4.c Thu Apr 19 22:10:19 2001
@@ -120,8 +120,8 @@

static char *revision = "$Revision: 1.20.6.5 $";

-#undef CONFIG_C4_DEBUG
-#undef CONFIG_C4_POLLDEBUG
+#undef C4_DEBUG
+#undef C4_POLLDEBUG

/* ------------------------------------------------------------- */

@@ -512,7 +512,7 @@

skb = skb_dequeue(&dma->send_queue);
if (!skb) {
-#ifdef CONFIG_C4_DEBUG
+#ifdef C4_DEBUG
printk(KERN_DEBUG "%s: tx underrun\n", card->name);
#endif
restore_flags(flags);
@@ -537,16 +537,16 @@
_put_slice(&p, skb->data, len);
}
txlen = (__u8 *)p - (__u8 *)dma->sendbuf;
-#ifdef CONFIG_C4_DEBUG
+#ifdef C4_DEBUG
printk(KERN_DEBUG "%s: tx put msg len=%d\n", card->name, txlen);
#endif
} else {
txlen = skb->len-2;
-#ifdef CONFIG_C4_POLLDEBUG
+#ifdef C4_POLLDEBUG
if (skb->data[2] == SEND_POLLACK)
printk(KERN_INFO "%s: ack to c4\n", card->name);
#endif
-#ifdef CONFIG_C4_DEBUG
+#ifdef C4_DEBUG
printk(KERN_DEBUG "%s: tx put 0x%x len=%d\n",
card->name, skb->data[2], txlen);
#endif
@@ -602,7 +602,7 @@
__u32 cidx;


-#ifdef CONFIG_C4_DEBUG
+#ifdef C4_DEBUG
printk(KERN_DEBUG "%s: rx 0x%x len=%lu\n", card->name,
b1cmd, (unsigned long)dma->recvlen);
#endif
@@ -681,7 +681,7 @@
break;

case RECEIVE_START:
-#ifdef CONFIG_C4_POLLDEBUG
+#ifdef C4_POLLDEBUG
printk(KERN_INFO "%s: poll from c4\n", card->name);
#endif
if (!suppress_pollack)
diff -ur linux-2.4.4-pre4/drivers/isdn/avmb1/kcapi.c linux-2.4.4-pre4.config/drivers/isdn/avmb1/kcapi.c
--- linux-2.4.4-pre4/drivers/isdn/avmb1/kcapi.c Fri Mar 30 10:40:56 2001
+++ linux-2.4.4-pre4.config/drivers/isdn/avmb1/kcapi.c Thu Apr 19 22:12:29 2001
@@ -124,7 +124,7 @@
* PCMCIA cards (now patch for pcmcia-cs-3.0.13 needed) done.
*
*/
-#define CONFIG_AVMB1_COMPAT
+#define AVMB1_COMPAT

#include <linux/config.h>
#include <linux/module.h>
@@ -144,7 +144,7 @@
#include "capicmd.h"
#include "capiutil.h"
#include "capilli.h"
-#ifdef CONFIG_AVMB1_COMPAT
+#ifdef AVMB1_COMPAT
#include <linux/b1lli.h>
#endif

@@ -1415,7 +1415,7 @@
return dp;
}

-#ifdef CONFIG_AVMB1_COMPAT
+#ifdef AVMB1_COMPAT
static int old_capi_manufacturer(unsigned int cmd, void *data)
{
avmb1_loadandconfigdef ldef;
@@ -1617,7 +1617,7 @@
int retval;

switch (cmd) {
-#ifdef CONFIG_AVMB1_COMPAT
+#ifdef AVMB1_COMPAT
case AVMB1_ADDCARD:
case AVMB1_ADDCARD_WITH_TYPE:
case AVMB1_LOAD:
diff -ur linux-2.4.4-pre4/drivers/isdn/avmb1/t1pci.c linux-2.4.4-pre4.config/drivers/isdn/avmb1/t1pci.c
--- linux-2.4.4-pre4/drivers/isdn/avmb1/t1pci.c Fri Mar 30 10:40:56 2001
+++ linux-2.4.4-pre4.config/drivers/isdn/avmb1/t1pci.c Thu Apr 19 22:12:57 2001
@@ -96,9 +96,6 @@

static char *revision = "$Revision: 1.13.6.3 $";

-#undef CONFIG_T1PCI_DEBUG
-#undef CONFIG_T1PCI_POLLDEBUG
-
/* ------------------------------------------------------------- */

static struct pci_device_id t1pci_pci_tbl[] __initdata = {
diff -ur linux-2.4.4-pre4/drivers/isdn/hisax/elsa_ser.c linux-2.4.4-pre4.config/drivers/isdn/hisax/elsa_ser.c
--- linux-2.4.4-pre4/drivers/isdn/hisax/elsa_ser.c Fri Mar 30 10:40:57 2001
+++ linux-2.4.4-pre4.config/drivers/isdn/hisax/elsa_ser.c Thu Apr 19 22:18:10 2001
@@ -61,21 +61,12 @@
static inline unsigned int serial_inp(struct IsdnCardState *cs, int offset)
{
#ifdef SERIAL_DEBUG_REG
-#ifdef CONFIG_SERIAL_NOPAUSE_IO
- u_int val = inb(cs->hw.elsa.base + 8 + offset);
- debugl1(cs,"inp %s %02x",ModemIn[offset], val);
-#else
u_int val = inb_p(cs->hw.elsa.base + 8 + offset);
debugl1(cs,"inP %s %02x",ModemIn[offset], val);
-#endif
return(val);
#else
-#ifdef CONFIG_SERIAL_NOPAUSE_IO
- return inb(cs->hw.elsa.base + 8 + offset);
-#else
return inb_p(cs->hw.elsa.base + 8 + offset);
#endif
-#endif
}

static inline void serial_out(struct IsdnCardState *cs, int offset, int value)
@@ -90,17 +81,9 @@
int value)
{
#ifdef SERIAL_DEBUG_REG
-#ifdef CONFIG_SERIAL_NOPAUSE_IO
- debugl1(cs,"outp %s %02x",ModemOut[offset], value);
-#else
debugl1(cs,"outP %s %02x",ModemOut[offset], value);
#endif
-#endif
-#ifdef CONFIG_SERIAL_NOPAUSE_IO
- outb(value, cs->hw.elsa.base + 8 + offset);
-#else
outb_p(value, cs->hw.elsa.base + 8 + offset);
-#endif
}

/*
diff -ur linux-2.4.4-pre4/include/linux/isdn.h linux-2.4.4-pre4.config/include/linux/isdn.h
--- linux-2.4.4-pre4/include/linux/isdn.h Thu Apr 19 21:49:59 2001
+++ linux-2.4.4-pre4.config/include/linux/isdn.h Thu Apr 19 21:55:35 2001
@@ -47,22 +47,6 @@
#define ISDN_MINOR_PPPMAX (128 + (ISDN_MAX_CHANNELS-1))
#define ISDN_MINOR_STATUS 255

-#undef CONFIG_ISDN_WITH_ABC_CALLB
-#undef CONFIG_ISDN_WITH_ABC_UDP_CHECK
-#undef CONFIG_ISDN_WITH_ABC_UDP_CHECK_HANGUP
-#undef CONFIG_ISDN_WITH_ABC_UDP_CHECK_DIAL
-#undef CONFIG_ISDN_WITH_ABC_OUTGOING_EAZ
-#undef CONFIG_ISDN_WITH_ABC_LCR_SUPPORT
-#undef CONFIG_ISDN_WITH_ABC_IPV4_TCP_KEEPALIVE
-#undef CONFIG_ISDN_WITH_ABC_IPV4_DYNADDR
-#undef CONFIG_ISDN_WITH_ABC_RCV_NO_HUPTIMER
-#undef CONFIG_ISDN_WITH_ABC_ICALL_BIND
-#undef CONFIG_ISDN_WITH_ABC_CH_EXTINUSE
-#undef CONFIG_ISDN_WITH_ABC_CONN_ERROR
-#undef CONFIG_ISDN_WITH_ABC_RAWIPCOMPRESS
-#undef CONFIG_ISDN_WITH_ABC_IPTABLES_NETFILTER
-
-
/* New ioctl-codes */
#define IIOCNETAIF _IO('I',1)
#define IIOCNETDIF _IO('I',2)


2001-04-19 21:16:23

by David Woodhouse

[permalink] [raw]
Subject: Re: Dead symbol elimination, stage 1


[email protected] said:
> For instance, a quick scan of my latest ARM patch reveals:
> src@raistlin:[2]:<1009> grep 'diff.*Config.in' rmk1
> diff -urN linux-orig/drivers/mtd/Config.in linux/drivers/mtd/Config.in

Please could you make sure that whatever changes you have are in my CVS -
I'm working on getting ready to sync up.

--
dwmw2


2001-04-20 06:34:06

by Eyal Lebedinsky

[permalink] [raw]
Subject: Re: Dead symbol elimination, stage 1

"Eric S. Raymond" wrote:
>
> David Woodhouse <[email protected]>:
> >
> > [email protected] said:
> > > I read this as "I haven't fixed the problem because..." not as
> > > "Don't fix the problem." Please be more explicit next time so I won't
> > > step on your toes?
> >
> > "This is not a problem, please don't \"fix\" it".
>
> But it is. The more false positives I get in the dead-symbol reports,
> the harder it will be to spot real problems like that business in the
> ARM kernel.c file.

Eric,

I found myself in similar situations in the past, and my solution was
to establish a small file of "do not report" symbols. I then use this
file to avoid reporting problems with items that I know are being
handled or are known false positives. Yes, it is not automagic, but
it does do the job.

The file might also include private notes as to the status of each
excluded symbol.

--
Eyal Lebedinsky ([email protected]) <http://samba.anu.edu.au/eyal/>

2001-04-21 11:47:48

by Armin Schindler

[permalink] [raw]
Subject: Re: [kbuild-devel] Dead symbol elimination, stage 1

On Thu, 19 Apr 2001, Kai Germaschewski wrote:
> On Thu, 19 Apr 2001, Eric S. Raymond wrote:
>
> > The following patch cleans dead symbols out of the defconfigs in the 2.4.4pre4
> > source tree. It corrects a typo involving CONFIG_GEN_RTC. Another typo
> > involving CONFIG_SOUND_YMPCI doesn't need to be corrected, as the symbol
> > is never set in these files.
>
> While I think your work CONFIG_ cleanup is generally a good idea and will
> remove a lot of cruft, I don't think the defconfigs are worth the effort
> (but maybe I'm missing something).
>
> First, they are only used as defaults, and any inconsistency should get
> cleaned up before the user even sees it.
>
> Second, removing dead entries is not all which is needed to get a
> defconfig which is necessarily consistent. So if you want to have these,
> why don't you do a
>
> cp arch/$ARCH/defconfig .config
> make oldconfig
>
> AFAICS, this should remove old cruft and provide a .config (to be used as
> defconfig) which is consistent with the current config.in's.
>
>
> Anyway, I put together a patch which should clean up some issues which I
> was reminded of because of your work in the ISDN subsystem. I appended it,
> I hope the maintainer of the Eicon code (Armin) will clean up the missing
> Configure.help entries for his drivers.

Oops, thanks for the hint. I only sent the patch for 2.2.
I appended it for 2.4 and already send it to Linus.

Armin



--- Documentation/Configure.help_orig Sat Apr 21 13:19:11 2001
+++ Documentation/Configure.help Sat Apr 21 13:23:55 2001
@@ -15447,11 +15447,16 @@
latest isdn4k-utils package. Please read the file
Documentation/isdn/README.eicon for more information.

+Eicon legacy driver
+CONFIG_ISDN_DRV_EICON_OLD
+ Say Y here to use your Eicon active ISDN card with ISDN4Linux
+ isdn module.
+
Eicon Diva Server card support
CONFIG_ISDN_DRV_EICON_PCI
Say Y here if you have an Eicon Diva Server (BRI/PRI/4BRI) ISDN card.
Please read Documentation/isdn/README.eicon for more information.
-
+
Eicon old-type card support
CONFIG_ISDN_DRV_EICON_ISA
Say Y here if you have an old-type Eicon active ISDN card. In order
@@ -15461,7 +15466,7 @@
Documentation/isdn/README.eicon for more information.

Eicon driver type standalone
-CONFIG_ISDN_DRV_EICON_STANDALONE
+CONFIG_ISDN_DRV_EICON_DIVAS
Enable this option if you want the eicon driver as standalone
version with no interface to the ISDN4Linux isdn module. If you
say Y here, the eicon module only supports the Diva Server PCI