ia64/xen-unstable

changeset 5783:1febf5dabc4f

Update the -xen default config to Linux 2.6.12

Signed-off-by: ian@xensource.com
author iap10@freefall.cl.cam.ac.uk
date Thu Jul 14 21:03:41 2005 +0000 (2005-07-14)
parents cd95b96a172e
children 1d026c7023d2
files linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_32
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_32	Thu Jul 14 21:02:05 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_32	Thu Jul 14 21:03:41 2005 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  #
     1.5  # Automatically generated make config: don't edit
     1.6 -# Linux kernel version: 2.6.11.12-xen
     1.7 -# Thu Jun 30 16:58:00 2005
     1.8 +# Linux kernel version: 2.6.12-xen
     1.9 +# Thu Jul 14 21:55:53 2005
    1.10  #
    1.11  CONFIG_XEN=y
    1.12  CONFIG_ARCH_XEN=y
    1.13 @@ -34,6 +34,7 @@ CONFIG_EXPERIMENTAL=y
    1.14  CONFIG_BROKEN=y
    1.15  CONFIG_BROKEN_ON_SMP=y
    1.16  CONFIG_LOCK_KERNEL=y
    1.17 +CONFIG_INIT_ENV_ARG_LIMIT=32
    1.18  
    1.19  #
    1.20  # General setup
    1.21 @@ -46,14 +47,17 @@ CONFIG_BSD_PROCESS_ACCT=y
    1.22  # CONFIG_BSD_PROCESS_ACCT_V3 is not set
    1.23  CONFIG_SYSCTL=y
    1.24  # CONFIG_AUDIT is not set
    1.25 -CONFIG_LOG_BUF_SHIFT=14
    1.26  CONFIG_HOTPLUG=y
    1.27  CONFIG_KOBJECT_UEVENT=y
    1.28  # CONFIG_IKCONFIG is not set
    1.29 +# CONFIG_CPUSETS is not set
    1.30  CONFIG_EMBEDDED=y
    1.31  CONFIG_KALLSYMS=y
    1.32  # CONFIG_KALLSYMS_ALL is not set
    1.33  # CONFIG_KALLSYMS_EXTRA_PASS is not set
    1.34 +CONFIG_PRINTK=y
    1.35 +CONFIG_BUG=y
    1.36 +CONFIG_BASE_FULL=y
    1.37  CONFIG_FUTEX=y
    1.38  CONFIG_EPOLL=y
    1.39  # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
    1.40 @@ -63,6 +67,7 @@ CONFIG_CC_ALIGN_LABELS=0
    1.41  CONFIG_CC_ALIGN_LOOPS=0
    1.42  CONFIG_CC_ALIGN_JUMPS=0
    1.43  # CONFIG_TINY_SHMEM is not set
    1.44 +CONFIG_BASE_SMALL=0
    1.45  
    1.46  #
    1.47  # Loadable module support
    1.48 @@ -103,6 +108,7 @@ CONFIG_M686=y
    1.49  # CONFIG_MWINCHIPC6 is not set
    1.50  # CONFIG_MWINCHIP2 is not set
    1.51  # CONFIG_MWINCHIP3D is not set
    1.52 +# CONFIG_MGEODEGX1 is not set
    1.53  # CONFIG_MCYRIXIII is not set
    1.54  # CONFIG_MVIAC3_2 is not set
    1.55  # CONFIG_X86_GENERIC is not set
    1.56 @@ -126,6 +132,7 @@ CONFIG_NR_CPUS=8
    1.57  # CONFIG_SCHED_SMT is not set
    1.58  CONFIG_PREEMPT=y
    1.59  CONFIG_PREEMPT_BKL=y
    1.60 +# CONFIG_X86_REBOOTFIXUPS is not set
    1.61  CONFIG_MICROCODE=m
    1.62  CONFIG_X86_CPUID=m
    1.63  
    1.64 @@ -135,6 +142,7 @@ CONFIG_X86_CPUID=m
    1.65  CONFIG_EDD=m
    1.66  # CONFIG_NOHIGHMEM is not set
    1.67  CONFIG_HIGHMEM4G=y
    1.68 +# CONFIG_HIGHMEM64G is not set
    1.69  CONFIG_HIGHMEM=y
    1.70  CONFIG_MTRR=y
    1.71  CONFIG_HAVE_DEC_LOCK=y
    1.72 @@ -158,6 +166,8 @@ CONFIG_PCI_MMCONFIG=y
    1.73  # CONFIG_PCI_MSI is not set
    1.74  # CONFIG_PCI_LEGACY_PROC is not set
    1.75  CONFIG_PCI_NAMES=y
    1.76 +# CONFIG_PCI_DEBUG is not set
    1.77 +CONFIG_ISA_DMA_API=y
    1.78  CONFIG_ISA=y
    1.79  # CONFIG_EISA is not set
    1.80  # CONFIG_MCA is not set
    1.81 @@ -195,36 +205,13 @@ CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
    1.82  CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
    1.83  CONFIG_HOTPLUG_PCI_SHPC=m
    1.84  # CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set
    1.85 -
    1.86 -#
    1.87 -# Kernel hacking
    1.88 -#
    1.89 -CONFIG_DEBUG_KERNEL=y
    1.90 -CONFIG_MAGIC_SYSRQ=y
    1.91 -# CONFIG_SCHEDSTATS is not set
    1.92 -# CONFIG_DEBUG_SLAB is not set
    1.93 -CONFIG_DEBUG_PREEMPT=y
    1.94 -# CONFIG_DEBUG_SPINLOCK is not set
    1.95 -# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
    1.96 -# CONFIG_DEBUG_KOBJECT is not set
    1.97 -# CONFIG_DEBUG_HIGHMEM is not set
    1.98 -# CONFIG_DEBUG_BUGVERBOSE is not set
    1.99 -# CONFIG_DEBUG_INFO is not set
   1.100 -# CONFIG_DEBUG_FS is not set
   1.101 -# CONFIG_FRAME_POINTER is not set
   1.102 -# CONFIG_EARLY_PRINTK is not set
   1.103 -# CONFIG_DEBUG_STACKOVERFLOW is not set
   1.104 -# CONFIG_KPROBES is not set
   1.105 -# CONFIG_DEBUG_STACK_USAGE is not set
   1.106 -# CONFIG_DEBUG_PAGEALLOC is not set
   1.107 -# CONFIG_4KSTACKS is not set
   1.108 -CONFIG_X86_FIND_SMP_CONFIG=y
   1.109 -CONFIG_X86_MPPARSE=y
   1.110  CONFIG_GENERIC_HARDIRQS=y
   1.111  CONFIG_GENERIC_IRQ_PROBE=y
   1.112  CONFIG_X86_SMP=y
   1.113  CONFIG_X86_BIOS_REBOOT=y
   1.114  CONFIG_X86_TRAMPOLINE=y
   1.115 +CONFIG_SECCOMP=y
   1.116 +# CONFIG_EARLY_PRINTK is not set
   1.117  
   1.118  #
   1.119  # Executable file formats
   1.120 @@ -250,8 +237,8 @@ CONFIG_FW_LOADER=m
   1.121  #
   1.122  CONFIG_MTD=m
   1.123  # CONFIG_MTD_DEBUG is not set
   1.124 +CONFIG_MTD_CONCAT=m
   1.125  CONFIG_MTD_PARTITIONS=y
   1.126 -CONFIG_MTD_CONCAT=m
   1.127  CONFIG_MTD_REDBOOT_PARTS=m
   1.128  CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
   1.129  # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
   1.130 @@ -363,12 +350,12 @@ CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS
   1.131  #
   1.132  CONFIG_PARPORT=m
   1.133  CONFIG_PARPORT_PC=m
   1.134 -CONFIG_PARPORT_PC_CML1=m
   1.135  CONFIG_PARPORT_SERIAL=m
   1.136  CONFIG_PARPORT_PC_FIFO=y
   1.137  # CONFIG_PARPORT_PC_SUPERIO is not set
   1.138  CONFIG_PARPORT_PC_PCMCIA=m
   1.139 -# CONFIG_PARPORT_OTHER is not set
   1.140 +CONFIG_PARPORT_NOT_PC=y
   1.141 +# CONFIG_PARPORT_GSC is not set
   1.142  CONFIG_PARPORT_1284=y
   1.143  
   1.144  #
   1.145 @@ -639,6 +626,7 @@ CONFIG_SCSI_QLA2XXX=m
   1.146  # CONFIG_SCSI_QLA2300 is not set
   1.147  # CONFIG_SCSI_QLA2322 is not set
   1.148  # CONFIG_SCSI_QLA6312 is not set
   1.149 +CONFIG_SCSI_LPFC=m
   1.150  # CONFIG_SCSI_SEAGATE is not set
   1.151  CONFIG_SCSI_SYM53C416=m
   1.152  CONFIG_SCSI_DC395x=m
   1.153 @@ -668,9 +656,6 @@ CONFIG_CD_NO_IDESCSI=y
   1.154  CONFIG_AZTCD=m
   1.155  CONFIG_GSCD=m
   1.156  CONFIG_SBPCD=m
   1.157 -CONFIG_MCD=m
   1.158 -CONFIG_MCD_IRQ=11
   1.159 -CONFIG_MCD_BASE=0x300
   1.160  CONFIG_MCDX=m
   1.161  CONFIG_OPTCD=m
   1.162  CONFIG_CM206=m
   1.163 @@ -697,6 +682,8 @@ CONFIG_DM_CRYPT=m
   1.164  CONFIG_DM_SNAPSHOT=m
   1.165  CONFIG_DM_MIRROR=m
   1.166  CONFIG_DM_ZERO=m
   1.167 +CONFIG_DM_MULTIPATH=m
   1.168 +CONFIG_DM_MULTIPATH_EMC=m
   1.169  
   1.170  #
   1.171  # Fusion MPT device support
   1.172 @@ -756,7 +743,6 @@ CONFIG_NET=y
   1.173  #
   1.174  CONFIG_PACKET=m
   1.175  CONFIG_PACKET_MMAP=y
   1.176 -CONFIG_NETLINK_DEV=m
   1.177  CONFIG_UNIX=m
   1.178  CONFIG_NET_KEY=m
   1.179  CONFIG_INET=y
   1.180 @@ -765,6 +751,7 @@ CONFIG_IP_ADVANCED_ROUTER=y
   1.181  CONFIG_IP_MULTIPLE_TABLES=y
   1.182  CONFIG_IP_ROUTE_FWMARK=y
   1.183  CONFIG_IP_ROUTE_MULTIPATH=y
   1.184 +# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
   1.185  CONFIG_IP_ROUTE_VERBOSE=y
   1.186  # CONFIG_IP_PNP is not set
   1.187  CONFIG_NET_IPIP=m
   1.188 @@ -895,7 +882,7 @@ CONFIG_IP_NF_ARPFILTER=m
   1.189  CONFIG_IP_NF_ARP_MANGLE=m
   1.190  
   1.191  #
   1.192 -# IPv6: Netfilter Configuration
   1.193 +# IPv6: Netfilter Configuration (EXPERIMENTAL)
   1.194  #
   1.195  CONFIG_IP6_NF_QUEUE=m
   1.196  CONFIG_IP6_NF_IPTABLES=m
   1.197 @@ -1014,6 +1001,7 @@ CONFIG_NET_SCH_INGRESS=m
   1.198  CONFIG_NET_QOS=y
   1.199  CONFIG_NET_ESTIMATOR=y
   1.200  CONFIG_NET_CLS=y
   1.201 +CONFIG_NET_CLS_BASIC=m
   1.202  CONFIG_NET_CLS_TCINDEX=m
   1.203  CONFIG_NET_CLS_ROUTE4=m
   1.204  CONFIG_NET_CLS_ROUTE=y
   1.205 @@ -1024,6 +1012,12 @@ CONFIG_NET_CLS_U32=m
   1.206  # CONFIG_CLS_U32_MARK is not set
   1.207  CONFIG_NET_CLS_RSVP=m
   1.208  CONFIG_NET_CLS_RSVP6=m
   1.209 +CONFIG_NET_EMATCH=y
   1.210 +CONFIG_NET_EMATCH_STACK=32
   1.211 +CONFIG_NET_EMATCH_CMP=m
   1.212 +CONFIG_NET_EMATCH_NBYTE=m
   1.213 +CONFIG_NET_EMATCH_U32=m
   1.214 +CONFIG_NET_EMATCH_META=m
   1.215  # CONFIG_NET_CLS_ACT is not set
   1.216  CONFIG_NET_CLS_POLICE=y
   1.217  
   1.218 @@ -1155,7 +1149,6 @@ CONFIG_DUMMY=m
   1.219  CONFIG_BONDING=m
   1.220  CONFIG_EQUALIZER=m
   1.221  CONFIG_TUN=m
   1.222 -CONFIG_ETHERTAP=m
   1.223  CONFIG_NET_SB1000=m
   1.224  
   1.225  #
   1.226 @@ -1242,7 +1235,6 @@ CONFIG_CS89x0=m
   1.227  # CONFIG_DGRS is not set
   1.228  CONFIG_EEPRO100=m
   1.229  CONFIG_E100=m
   1.230 -# CONFIG_E100_NAPI is not set
   1.231  CONFIG_FEALNX=m
   1.232  CONFIG_NATSEMI=m
   1.233  CONFIG_NE2K_PCI=m
   1.234 @@ -1280,6 +1272,7 @@ CONFIG_R8169=m
   1.235  CONFIG_SK98LIN=m
   1.236  CONFIG_VIA_VELOCITY=m
   1.237  CONFIG_TIGON3=m
   1.238 +CONFIG_BNX2=m
   1.239  
   1.240  #
   1.241  # Ethernet (10000 Mbit)
   1.242 @@ -1457,7 +1450,6 @@ CONFIG_SLIP_COMPRESSED=y
   1.243  CONFIG_SLIP_SMART=y
   1.244  CONFIG_SLIP_MODE_SLIP6=y
   1.245  CONFIG_NET_FC=y
   1.246 -# CONFIG_IPHASE5526 is not set
   1.247  CONFIG_SHAPER=m
   1.248  CONFIG_NETCONSOLE=m
   1.249  
   1.250 @@ -1552,6 +1544,7 @@ CONFIG_HISAX_TELES_CS=m
   1.251  #
   1.252  CONFIG_HISAX_ST5481=m
   1.253  CONFIG_HISAX_HFCUSB=m
   1.254 +CONFIG_HISAX_HFC4S8S=m
   1.255  CONFIG_HISAX_FRITZ_PCIPNP=m
   1.256  CONFIG_HISAX_HDLC=y
   1.257  
   1.258 @@ -1562,7 +1555,6 @@ CONFIG_ISDN_DRV_ICN=m
   1.259  CONFIG_ISDN_DRV_PCBIT=m
   1.260  CONFIG_ISDN_DRV_SC=m
   1.261  CONFIG_ISDN_DRV_ACT2000=m
   1.262 -CONFIG_ISDN_DRV_TPAM=m
   1.263  CONFIG_HYSDN=m
   1.264  CONFIG_HYSDN_CAPI=y
   1.265  
   1.266 @@ -1632,26 +1624,6 @@ CONFIG_INPUT_EVDEV=m
   1.267  CONFIG_INPUT_EVBUG=m
   1.268  
   1.269  #
   1.270 -# Input I/O drivers
   1.271 -#
   1.272 -CONFIG_GAMEPORT=m
   1.273 -CONFIG_SOUND_GAMEPORT=m
   1.274 -CONFIG_GAMEPORT_NS558=m
   1.275 -CONFIG_GAMEPORT_L4=m
   1.276 -CONFIG_GAMEPORT_EMU10K1=m
   1.277 -CONFIG_GAMEPORT_VORTEX=m
   1.278 -CONFIG_GAMEPORT_FM801=m
   1.279 -# CONFIG_GAMEPORT_CS461X is not set
   1.280 -CONFIG_SERIO=y
   1.281 -CONFIG_SERIO_I8042=y
   1.282 -CONFIG_SERIO_SERPORT=m
   1.283 -CONFIG_SERIO_CT82C710=m
   1.284 -CONFIG_SERIO_PARKBD=m
   1.285 -CONFIG_SERIO_PCIPS2=m
   1.286 -CONFIG_SERIO_LIBPS2=y
   1.287 -CONFIG_SERIO_RAW=m
   1.288 -
   1.289 -#
   1.290  # Input Device Drivers
   1.291  #
   1.292  CONFIG_INPUT_KEYBOARD=y
   1.293 @@ -1688,18 +1660,40 @@ CONFIG_JOYSTICK_MAGELLAN=m
   1.294  CONFIG_JOYSTICK_SPACEORB=m
   1.295  CONFIG_JOYSTICK_SPACEBALL=m
   1.296  CONFIG_JOYSTICK_STINGER=m
   1.297 -CONFIG_JOYSTICK_TWIDDLER=m
   1.298 +CONFIG_JOYSTICK_TWIDJOY=m
   1.299  CONFIG_JOYSTICK_DB9=m
   1.300  CONFIG_JOYSTICK_GAMECON=m
   1.301  CONFIG_JOYSTICK_TURBOGRAFX=m
   1.302  CONFIG_JOYSTICK_JOYDUMP=m
   1.303  CONFIG_INPUT_TOUCHSCREEN=y
   1.304  CONFIG_TOUCHSCREEN_GUNZE=m
   1.305 +CONFIG_TOUCHSCREEN_ELO=m
   1.306 +CONFIG_TOUCHSCREEN_MTOUCH=m
   1.307 +CONFIG_TOUCHSCREEN_MK712=m
   1.308  CONFIG_INPUT_MISC=y
   1.309  CONFIG_INPUT_PCSPKR=m
   1.310  CONFIG_INPUT_UINPUT=m
   1.311  
   1.312  #
   1.313 +# Hardware I/O ports
   1.314 +#
   1.315 +CONFIG_SERIO=y
   1.316 +CONFIG_SERIO_I8042=y
   1.317 +CONFIG_SERIO_SERPORT=m
   1.318 +CONFIG_SERIO_CT82C710=m
   1.319 +CONFIG_SERIO_PARKBD=m
   1.320 +CONFIG_SERIO_PCIPS2=m
   1.321 +CONFIG_SERIO_LIBPS2=y
   1.322 +CONFIG_SERIO_RAW=m
   1.323 +CONFIG_GAMEPORT=m
   1.324 +CONFIG_GAMEPORT_NS558=m
   1.325 +CONFIG_GAMEPORT_L4=m
   1.326 +CONFIG_GAMEPORT_EMU10K1=m
   1.327 +CONFIG_GAMEPORT_VORTEX=m
   1.328 +CONFIG_GAMEPORT_FM801=m
   1.329 +# CONFIG_GAMEPORT_CS461X is not set
   1.330 +
   1.331 +#
   1.332  # Character devices
   1.333  #
   1.334  CONFIG_VT=y
   1.335 @@ -1720,6 +1714,7 @@ CONFIG_SERIAL_8250_NR_UARTS=4
   1.336  # Non-8250 serial port support
   1.337  #
   1.338  CONFIG_SERIAL_CORE=m
   1.339 +CONFIG_SERIAL_JSM=m
   1.340  CONFIG_UNIX98_PTYS=y
   1.341  CONFIG_LEGACY_PTYS=y
   1.342  CONFIG_LEGACY_PTY_COUNT=256
   1.343 @@ -1828,7 +1823,6 @@ CONFIG_AGP_ATI=m
   1.344  CONFIG_AGP_AMD=m
   1.345  CONFIG_AGP_AMD64=m
   1.346  CONFIG_AGP_INTEL=m
   1.347 -CONFIG_AGP_INTEL_MCH=m
   1.348  CONFIG_AGP_NVIDIA=m
   1.349  CONFIG_AGP_SIS=m
   1.350  CONFIG_AGP_SWORKS=m
   1.351 @@ -1857,6 +1851,13 @@ CONFIG_MAX_RAW_DEVS=256
   1.352  CONFIG_HANGCHECK_TIMER=m
   1.353  
   1.354  #
   1.355 +# TPM devices
   1.356 +#
   1.357 +CONFIG_TCG_TPM=m
   1.358 +CONFIG_TCG_NSC=m
   1.359 +CONFIG_TCG_ATMEL=m
   1.360 +
   1.361 +#
   1.362  # I2C support
   1.363  #
   1.364  CONFIG_I2C=m
   1.365 @@ -1881,11 +1882,11 @@ CONFIG_I2C_AMD8111=m
   1.366  CONFIG_I2C_ELEKTOR=m
   1.367  CONFIG_I2C_I801=m
   1.368  CONFIG_I2C_I810=m
   1.369 +CONFIG_I2C_PIIX4=m
   1.370  CONFIG_I2C_ISA=m
   1.371  CONFIG_I2C_NFORCE2=m
   1.372  CONFIG_I2C_PARPORT=m
   1.373  CONFIG_I2C_PARPORT_LIGHT=m
   1.374 -CONFIG_I2C_PIIX4=m
   1.375  CONFIG_I2C_PROSAVAGE=m
   1.376  CONFIG_I2C_SAVAGE4=m
   1.377  CONFIG_SCx200_I2C=m
   1.378 @@ -1912,7 +1913,9 @@ CONFIG_SENSORS_ADM1031=m
   1.379  CONFIG_SENSORS_ASB100=m
   1.380  CONFIG_SENSORS_DS1621=m
   1.381  CONFIG_SENSORS_FSCHER=m
   1.382 +CONFIG_SENSORS_FSCPOS=m
   1.383  CONFIG_SENSORS_GL518SM=m
   1.384 +CONFIG_SENSORS_GL520SM=m
   1.385  CONFIG_SENSORS_IT87=m
   1.386  CONFIG_SENSORS_LM63=m
   1.387  CONFIG_SENSORS_LM75=m
   1.388 @@ -1923,9 +1926,11 @@ CONFIG_SENSORS_LM83=m
   1.389  CONFIG_SENSORS_LM85=m
   1.390  CONFIG_SENSORS_LM87=m
   1.391  CONFIG_SENSORS_LM90=m
   1.392 +CONFIG_SENSORS_LM92=m
   1.393  CONFIG_SENSORS_MAX1619=m
   1.394  CONFIG_SENSORS_PC87360=m
   1.395  # CONFIG_SENSORS_SMSC47B397 is not set
   1.396 +CONFIG_SENSORS_SIS5595=m
   1.397  CONFIG_SENSORS_SMSC47M1=m
   1.398  CONFIG_SENSORS_VIA686A=m
   1.399  CONFIG_SENSORS_W83781D=m
   1.400 @@ -1935,6 +1940,7 @@ CONFIG_SENSORS_W83627HF=m
   1.401  #
   1.402  # Other I2C Chip support
   1.403  #
   1.404 +CONFIG_SENSORS_DS1337=m
   1.405  CONFIG_SENSORS_EEPROM=m
   1.406  CONFIG_SENSORS_PCF8574=m
   1.407  CONFIG_SENSORS_PCF8591=m
   1.408 @@ -2051,8 +2057,11 @@ CONFIG_DVB_CINERGYT2=m
   1.409  #
   1.410  # Supported FlexCopII (B2C2) Adapters
   1.411  #
   1.412 +CONFIG_DVB_B2C2_FLEXCOP=m
   1.413 +CONFIG_DVB_B2C2_FLEXCOP_PCI=m
   1.414 +CONFIG_DVB_B2C2_FLEXCOP_USB=m
   1.415 +# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
   1.416  CONFIG_DVB_B2C2_SKYSTAR=m
   1.417 -CONFIG_DVB_B2C2_USB=m
   1.418  
   1.419  #
   1.420  # Supported BT878 Adapters
   1.421 @@ -2103,6 +2112,8 @@ CONFIG_DVB_STV0297=m
   1.422  # ATSC (North American/Korean Terresterial DTV) frontends
   1.423  #
   1.424  CONFIG_DVB_NXT2002=m
   1.425 +CONFIG_DVB_OR51211=m
   1.426 +CONFIG_DVB_OR51132=m
   1.427  CONFIG_VIDEO_SAA7146=m
   1.428  CONFIG_VIDEO_SAA7146_VV=m
   1.429  CONFIG_VIDEO_VIDEOBUF=m
   1.430 @@ -2116,6 +2127,11 @@ CONFIG_VIDEO_TVEEPROM=m
   1.431  # Graphics support
   1.432  #
   1.433  CONFIG_FB=y
   1.434 +CONFIG_FB_CFB_FILLRECT=m
   1.435 +CONFIG_FB_CFB_COPYAREA=m
   1.436 +CONFIG_FB_CFB_IMAGEBLIT=m
   1.437 +CONFIG_FB_SOFT_CURSOR=m
   1.438 +# CONFIG_FB_MACMODES is not set
   1.439  CONFIG_FB_MODE_HELPERS=y
   1.440  CONFIG_FB_TILEBLITTING=y
   1.441  CONFIG_FB_CIRRUS=m
   1.442 @@ -2129,6 +2145,8 @@ CONFIG_FB_VGA16=m
   1.443  CONFIG_VIDEO_SELECT=y
   1.444  CONFIG_FB_HGA=m
   1.445  # CONFIG_FB_HGA_ACCEL is not set
   1.446 +CONFIG_FB_NVIDIA=m
   1.447 +CONFIG_FB_NVIDIA_I2C=y
   1.448  CONFIG_FB_RIVA=m
   1.449  CONFIG_FB_RIVA_I2C=y
   1.450  CONFIG_FB_RIVA_DEBUG=y
   1.451 @@ -2153,8 +2171,8 @@ CONFIG_FB_ATY_GENERIC_LCD=y
   1.452  CONFIG_FB_ATY_XL_INIT=y
   1.453  CONFIG_FB_ATY_GX=y
   1.454  CONFIG_FB_SAVAGE=m
   1.455 -CONFIG_FB_SAVAGE_I2C=m
   1.456 -CONFIG_FB_SAVAGE_ACCEL=m
   1.457 +CONFIG_FB_SAVAGE_I2C=y
   1.458 +CONFIG_FB_SAVAGE_ACCEL=y
   1.459  CONFIG_FB_SIS=m
   1.460  CONFIG_FB_SIS_300=y
   1.461  CONFIG_FB_SIS_315=y
   1.462 @@ -2166,6 +2184,9 @@ CONFIG_FB_VOODOO1=m
   1.463  CONFIG_FB_TRIDENT=m
   1.464  # CONFIG_FB_TRIDENT_ACCEL is not set
   1.465  # CONFIG_FB_PM3 is not set
   1.466 +CONFIG_FB_GEODE=y
   1.467 +CONFIG_FB_GEODE_GX1=m
   1.468 +CONFIG_FB_S1D13XXX=m
   1.469  CONFIG_FB_VIRTUAL=m
   1.470  
   1.471  #
   1.472 @@ -2207,6 +2228,7 @@ CONFIG_SND_SEQUENCER_OSS=y
   1.473  CONFIG_SND_RTCTIMER=m
   1.474  # CONFIG_SND_VERBOSE_PRINTK is not set
   1.475  # CONFIG_SND_DEBUG is not set
   1.476 +CONFIG_SND_GENERIC_PM=y
   1.477  
   1.478  #
   1.479  # Generic devices
   1.480 @@ -2224,6 +2246,8 @@ CONFIG_SND_MPU401=m
   1.481  #
   1.482  # ISA devices
   1.483  #
   1.484 +CONFIG_SND_AD1848_LIB=m
   1.485 +CONFIG_SND_CS4231_LIB=m
   1.486  CONFIG_SND_AD1816A=m
   1.487  CONFIG_SND_AD1848=m
   1.488  CONFIG_SND_CS4231=m
   1.489 @@ -2299,6 +2323,7 @@ CONFIG_SND_SONICVIBES=m
   1.490  CONFIG_SND_VIA82XX=m
   1.491  # CONFIG_SND_VIA82XX_MODEM is not set
   1.492  CONFIG_SND_VX222=m
   1.493 +CONFIG_SND_HDA_INTEL=m
   1.494  
   1.495  #
   1.496  # USB devices
   1.497 @@ -2389,6 +2414,8 @@ CONFIG_SOUND_AD1980=m
   1.498  #
   1.499  # USB support
   1.500  #
   1.501 +CONFIG_USB_ARCH_HAS_HCD=y
   1.502 +CONFIG_USB_ARCH_HAS_OHCI=y
   1.503  CONFIG_USB=y
   1.504  # CONFIG_USB_DEBUG is not set
   1.505  
   1.506 @@ -2399,8 +2426,6 @@ CONFIG_USB_DEVICEFS=y
   1.507  CONFIG_USB_BANDWIDTH=y
   1.508  # CONFIG_USB_DYNAMIC_MINORS is not set
   1.509  # CONFIG_USB_OTG is not set
   1.510 -CONFIG_USB_ARCH_HAS_HCD=y
   1.511 -CONFIG_USB_ARCH_HAS_OHCI=y
   1.512  
   1.513  #
   1.514  # USB Host Controller Drivers
   1.515 @@ -2409,8 +2434,11 @@ CONFIG_USB_EHCI_HCD=y
   1.516  CONFIG_USB_EHCI_SPLIT_ISO=y
   1.517  CONFIG_USB_EHCI_ROOT_HUB_TT=y
   1.518  CONFIG_USB_OHCI_HCD=m
   1.519 +# CONFIG_USB_OHCI_BIG_ENDIAN is not set
   1.520 +CONFIG_USB_OHCI_LITTLE_ENDIAN=y
   1.521  CONFIG_USB_UHCI_HCD=m
   1.522  CONFIG_USB_SL811_HCD=m
   1.523 +CONFIG_USB_SL811_CS=m
   1.524  
   1.525  #
   1.526  # USB Device Class drivers
   1.527 @@ -2429,12 +2457,11 @@ CONFIG_USB_PRINTER=m
   1.528  #
   1.529  CONFIG_USB_STORAGE=m
   1.530  # CONFIG_USB_STORAGE_DEBUG is not set
   1.531 -# CONFIG_USB_STORAGE_RW_DETECT is not set
   1.532  CONFIG_USB_STORAGE_DATAFAB=y
   1.533  CONFIG_USB_STORAGE_FREECOM=y
   1.534  CONFIG_USB_STORAGE_ISD200=y
   1.535  CONFIG_USB_STORAGE_DPCM=y
   1.536 -CONFIG_USB_STORAGE_HP8200e=y
   1.537 +CONFIG_USB_STORAGE_USBAT=y
   1.538  CONFIG_USB_STORAGE_SDDR09=y
   1.539  CONFIG_USB_STORAGE_SDDR55=y
   1.540  CONFIG_USB_STORAGE_JUMPSHOT=y
   1.541 @@ -2466,7 +2493,6 @@ CONFIG_USB_ATI_REMOTE=m
   1.542  #
   1.543  CONFIG_USB_MDC800=m
   1.544  CONFIG_USB_MICROTEK=m
   1.545 -CONFIG_USB_HPUSBSCSI=m
   1.546  
   1.547  #
   1.548  # USB Multimedia devices
   1.549 @@ -2481,6 +2507,7 @@ CONFIG_USB_SE401=m
   1.550  CONFIG_USB_SN9C102=m
   1.551  CONFIG_USB_STV680=m
   1.552  CONFIG_USB_W9968CF=m
   1.553 +CONFIG_USB_PWC=m
   1.554  
   1.555  #
   1.556  # USB Network Adapters
   1.557 @@ -2514,6 +2541,8 @@ CONFIG_USB_CDCETHER=y
   1.558  # USB Network Adapters
   1.559  #
   1.560  CONFIG_USB_AX8817X=y
   1.561 +CONFIG_USB_ZD1201=m
   1.562 +CONFIG_USB_MON=m
   1.563  
   1.564  #
   1.565  # USB port drivers
   1.566 @@ -2525,9 +2554,11 @@ CONFIG_USB_USS720=m
   1.567  #
   1.568  CONFIG_USB_SERIAL=m
   1.569  CONFIG_USB_SERIAL_GENERIC=y
   1.570 +CONFIG_USB_SERIAL_AIRPRIME=m
   1.571  CONFIG_USB_SERIAL_BELKIN=m
   1.572  CONFIG_USB_SERIAL_WHITEHEAT=m
   1.573  CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
   1.574 +CONFIG_USB_SERIAL_CP2101=m
   1.575  CONFIG_USB_SERIAL_CYPRESS_M8=m
   1.576  CONFIG_USB_SERIAL_EMPEG=m
   1.577  CONFIG_USB_SERIAL_FTDI_SIO=m
   1.578 @@ -2556,11 +2587,13 @@ CONFIG_USB_SERIAL_KLSI=m
   1.579  CONFIG_USB_SERIAL_KOBIL_SCT=m
   1.580  CONFIG_USB_SERIAL_MCT_U232=m
   1.581  CONFIG_USB_SERIAL_PL2303=m
   1.582 +CONFIG_USB_SERIAL_HP4X=m
   1.583  CONFIG_USB_SERIAL_SAFE=m
   1.584  # CONFIG_USB_SERIAL_SAFE_PADDED is not set
   1.585  # CONFIG_USB_SERIAL_TI is not set
   1.586  CONFIG_USB_SERIAL_CYBERJACK=m
   1.587  CONFIG_USB_SERIAL_XIRCOM=m
   1.588 +CONFIG_USB_SERIAL_OPTION=m
   1.589  CONFIG_USB_SERIAL_OMNINET=m
   1.590  CONFIG_USB_EZUSB=y
   1.591  
   1.592 @@ -2578,6 +2611,7 @@ CONFIG_USB_CYTHERM=m
   1.593  CONFIG_USB_PHIDGETKIT=m
   1.594  CONFIG_USB_PHIDGETSERVO=m
   1.595  # CONFIG_USB_IDMOUSE is not set
   1.596 +CONFIG_USB_SISUSBVGA=m
   1.597  CONFIG_USB_TEST=m
   1.598  
   1.599  #
   1.600 @@ -2595,10 +2629,9 @@ CONFIG_USB_GADGET_NET2280=y
   1.601  CONFIG_USB_NET2280=m
   1.602  # CONFIG_USB_GADGET_PXA2XX is not set
   1.603  # CONFIG_USB_GADGET_GOKU is not set
   1.604 -# CONFIG_USB_GADGET_SA1100 is not set
   1.605  # CONFIG_USB_GADGET_LH7A40X is not set
   1.606 +# CONFIG_USB_GADGET_OMAP is not set
   1.607  # CONFIG_USB_GADGET_DUMMY_HCD is not set
   1.608 -# CONFIG_USB_GADGET_OMAP is not set
   1.609  CONFIG_USB_GADGET_DUALSPEED=y
   1.610  CONFIG_USB_ZERO=m
   1.611  CONFIG_USB_ETH=m
   1.612 @@ -2889,7 +2922,7 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=
   1.613  CONFIG_SECURITY_SELINUX_DISABLE=y
   1.614  CONFIG_SECURITY_SELINUX_DEVELOP=y
   1.615  CONFIG_SECURITY_SELINUX_AVC_STATS=y
   1.616 -# CONFIG_SECURITY_SELINUX_MLS is not set
   1.617 +CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
   1.618  
   1.619  #
   1.620  # Cryptographic options
   1.621 @@ -2903,6 +2936,7 @@ CONFIG_CRYPTO_SHA1=m
   1.622  CONFIG_CRYPTO_SHA256=m
   1.623  CONFIG_CRYPTO_SHA512=m
   1.624  CONFIG_CRYPTO_WP512=m
   1.625 +CONFIG_CRYPTO_TGR192=m
   1.626  CONFIG_CRYPTO_DES=m
   1.627  CONFIG_CRYPTO_BLOWFISH=m
   1.628  CONFIG_CRYPTO_TWOFISH=m
   1.629 @@ -2934,3 +2968,29 @@ CONFIG_ZLIB_INFLATE=y
   1.630  CONFIG_ZLIB_DEFLATE=m
   1.631  CONFIG_REED_SOLOMON=m
   1.632  CONFIG_REED_SOLOMON_DEC16=y
   1.633 +
   1.634 +#
   1.635 +# Kernel hacking
   1.636 +#
   1.637 +# CONFIG_PRINTK_TIME is not set
   1.638 +CONFIG_DEBUG_KERNEL=y
   1.639 +CONFIG_MAGIC_SYSRQ=y
   1.640 +CONFIG_LOG_BUF_SHIFT=14
   1.641 +# CONFIG_SCHEDSTATS is not set
   1.642 +# CONFIG_DEBUG_SLAB is not set
   1.643 +CONFIG_DEBUG_PREEMPT=y
   1.644 +# CONFIG_DEBUG_SPINLOCK is not set
   1.645 +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
   1.646 +# CONFIG_DEBUG_KOBJECT is not set
   1.647 +# CONFIG_DEBUG_HIGHMEM is not set
   1.648 +# CONFIG_DEBUG_BUGVERBOSE is not set
   1.649 +# CONFIG_DEBUG_INFO is not set
   1.650 +# CONFIG_DEBUG_FS is not set
   1.651 +# CONFIG_FRAME_POINTER is not set
   1.652 +# CONFIG_DEBUG_STACKOVERFLOW is not set
   1.653 +# CONFIG_KPROBES is not set
   1.654 +# CONFIG_DEBUG_STACK_USAGE is not set
   1.655 +# CONFIG_DEBUG_PAGEALLOC is not set
   1.656 +# CONFIG_4KSTACKS is not set
   1.657 +CONFIG_X86_FIND_SMP_CONFIG=y
   1.658 +CONFIG_X86_MPPARSE=y