upgrade orion to 2.6.26-rc5

[openwrt.git] / target / linux / olpc / config-2.6.23

diff --git a/target/linux/olpc/config-2.6.23 b/target/linux/olpc/config-2.6.23
index 4597d43..e6e1708 100644 (file)
--- a/target/linux/olpc/config-2.6.23
+++ b/target/linux/olpc/config-2.6.23
@@ -1,7 +1,6 @@
-# CONFIG_3C515 is not set

 # CONFIG_60XX_WDT is not set
 # CONFIG_8139TOO is not set
 # CONFIG_60XX_WDT is not set
 # CONFIG_8139TOO is not set

-# CONFIG_AC3200 is not set
+CONFIG_AC97_BUS=m

 # CONFIG_ACPI is not set
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_ADVANTECH_WDT is not set
 # CONFIG_ACPI is not set
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_ADVANTECH_WDT is not set


@@ -10,7 +9,6 @@
 # CONFIG_ALIM1535_WDT is not set
 # CONFIG_ALIM7101_WDT is not set
 # CONFIG_APM is not set
 # CONFIG_ALIM1535_WDT is not set
 # CONFIG_ALIM7101_WDT is not set
 # CONFIG_APM is not set

-# CONFIG_APRICOT is not set

 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y


@@ -18,9 +16,7 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SUPPORTS_MSI=y

-# CONFIG_AT1700 is not set

 # CONFIG_ATM is not set
 # CONFIG_ATM is not set

-# CONFIG_AX25 is not set

 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_BACKLIGHT_PROGEAR is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_BACKLIGHT_PROGEAR is not set


@@ -30,30 +26,19 @@ CONFIG_BATTERY_OLPC=y
 # CONFIG_BINFMT_AOUT is not set
 CONFIG_BINFMT_MISC=y
 CONFIG_BITREVERSE=y
 # CONFIG_BINFMT_AOUT is not set
 CONFIG_BINFMT_MISC=y
 CONFIG_BITREVERSE=y

-CONFIG_BLK_DEV_CRYPTOLOOP=y
-CONFIG_BLK_DEV_GENERIC=y
-# CONFIG_BLK_DEV_HD is not set
-# CONFIG_BLK_DEV_HD_IDE is not set
-# CONFIG_BLK_DEV_HPT34X is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-CONFIG_BLK_DEV_IDE=y
-CONFIG_BLK_DEV_IDEDISK=y
+CONFIG_BLK_DEV_GENERIC=m
+CONFIG_BLK_DEV_IDE=m
+CONFIG_BLK_DEV_IDEDISK=m

 CONFIG_BLK_DEV_IDEDMA=y
 CONFIG_BLK_DEV_IDEDMA=y

-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set

 CONFIG_BLK_DEV_IDEDMA_PCI=y
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_BLK_DEV_IDEDMA_PCI=y
 CONFIG_BLK_DEV_IDEPCI=y

-CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_LOOP is not set

 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_NBD is not set

-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_SC1200=y
+CONFIG_BLK_DEV_SC1200=m

 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SR_VENDOR=y

-CONFIG_BLK_DEV_VIA82CXXX=y
-# CONFIG_BLK_DEV_XD is not set
+CONFIG_BLK_DEV_VIA82CXXX=m

 # CONFIG_BONDING is not set
 CONFIG_BOUNCE=y
 # CONFIG_BRIDGE_NF_EBTABLES is not set
 # CONFIG_BONDING is not set
 CONFIG_BOUNCE=y
 # CONFIG_BRIDGE_NF_EBTABLES is not set


@@ -64,27 +49,24 @@ CONFIG_CHR_DEV_SG=y
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_COMPAT_VDSO=y
 # CONFIG_CPU5_WDT is not set
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_COMPAT_VDSO=y
 # CONFIG_CPU5_WDT is not set

-# CONFIG_CPUSETS is not set

 # CONFIG_CPU_FREQ is not set
 # CONFIG_CRC_ITU_T is not set
 # CONFIG_CRYPTO_AES is not set
 # CONFIG_CRYPTO_AES_586 is not set
 # CONFIG_CPU_FREQ is not set
 # CONFIG_CRC_ITU_T is not set
 # CONFIG_CRYPTO_AES is not set
 # CONFIG_CRYPTO_AES_586 is not set

-CONFIG_CRYPTO_ALGAPI=y

 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set

-CONFIG_CRYPTO_BLKCIPHER=y

 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set

-CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CBC is not set

 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_DEFLATE is not set
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_DEFLATE is not set

+# CONFIG_CRYPTO_DES is not set

 # CONFIG_CRYPTO_ECB is not set
 # CONFIG_CRYPTO_HMAC is not set
 # CONFIG_CRYPTO_ECB is not set
 # CONFIG_CRYPTO_HMAC is not set

-# CONFIG_CRYPTO_HW is not set

 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_KHAZAD is not set

-CONFIG_CRYPTO_MANAGER=y
+# CONFIG_CRYPTO_MANAGER is not set

 # CONFIG_CRYPTO_MD4 is not set
 # CONFIG_CRYPTO_MD5 is not set
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
 # CONFIG_CRYPTO_MD4 is not set
 # CONFIG_CRYPTO_MD5 is not set
 # CONFIG_CRYPTO_MICHAEL_MIC is not set


@@ -94,16 +76,15 @@ CONFIG_CRYPTO_MANAGER=y
 # CONFIG_CRYPTO_SHA256 is not set
 # CONFIG_CRYPTO_SHA512 is not set
 # CONFIG_CRYPTO_TEA is not set
 # CONFIG_CRYPTO_SHA256 is not set
 # CONFIG_CRYPTO_SHA512 is not set
 # CONFIG_CRYPTO_TEA is not set

+# CONFIG_CRYPTO_TEST is not set

 # CONFIG_CRYPTO_TGR192 is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_TWOFISH_586 is not set
 # CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CS5535_GPIO is not set
 # CONFIG_CRYPTO_TGR192 is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_TWOFISH_586 is not set
 # CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CS5535_GPIO is not set

-# CONFIG_CS89x0 is not set

 # CONFIG_DCDBAS is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DELL_RBU is not set
 # CONFIG_DCDBAS is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DELL_RBU is not set

-# CONFIG_DEPCA is not set

 CONFIG_DEVPORT=y
 # CONFIG_DISABLE_CONSOLE_SUSPEND is not set
 CONFIG_DISPLAY_SUPPORT=y
 CONFIG_DEVPORT=y
 # CONFIG_DISABLE_CONSOLE_SUSPEND is not set
 CONFIG_DISPLAY_SUPPORT=y


@@ -117,13 +98,7 @@ CONFIG_EARLY_PRINTK=y
 # CONFIG_EDAC is not set
 # CONFIG_EDD is not set
 # CONFIG_EEPROM_93CX6 is not set
 # CONFIG_EDAC is not set
 # CONFIG_EDD is not set
 # CONFIG_EEPROM_93CX6 is not set

-# CONFIG_EISA is not set
-# CONFIG_EL1 is not set
-# CONFIG_EL16 is not set
-# CONFIG_EL2 is not set
-# CONFIG_EL3 is not set

 CONFIG_ELF_CORE=y
 CONFIG_ELF_CORE=y

-# CONFIG_ELPLUS is not set

 # CONFIG_EUROTECH_WDT is not set
 CONFIG_EXT2_FS=y
 # CONFIG_EXT3_FS is not set
 # CONFIG_EUROTECH_WDT is not set
 CONFIG_EXT2_FS=y
 # CONFIG_EXT3_FS is not set


@@ -195,8 +170,8 @@ CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_ISA_DMA=y

-CONFIG_GENERIC_PENDING_IRQ=y

 CONFIG_GEODE_MFGPT_TIMER=y
 CONFIG_GEODE_MFGPT_TIMER=y

+# CONFIG_HAMRADIO is not set

 # CONFIG_HANGCHECK_TIMER is not set
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 # CONFIG_HANGCHECK_TIMER is not set
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y


@@ -205,14 +180,12 @@ CONFIG_HAS_IOPORT=y
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_HFS_FS is not set
 CONFIG_HIBERNATION=y
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_HFS_FS is not set
 CONFIG_HIBERNATION=y

-CONFIG_HIBERNATION_SMP_POSSIBLE=y
+CONFIG_HIBERNATION_UP_POSSIBLE=y

 CONFIG_HID=y
 CONFIG_HID_SUPPORT=y
 # CONFIG_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set
 CONFIG_HID=y
 CONFIG_HID_SUPPORT=y
 # CONFIG_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set

-# CONFIG_HIGH_RES_TIMERS is not set

 # CONFIG_HOSTAP is not set
 # CONFIG_HOSTAP is not set

-CONFIG_HOTPLUG_CPU=y

 # CONFIG_HPET_TIMER is not set
 CONFIG_HT_IRQ=y
 # CONFIG_HUGETLBFS is not set
 # CONFIG_HPET_TIMER is not set
 CONFIG_HT_IRQ=y
 # CONFIG_HUGETLBFS is not set


@@ -225,19 +198,17 @@ CONFIG_HW_RANDOM_VIA=y
 CONFIG_I2C=y
 # CONFIG_I2C_ALGOBIT is not set
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C=y
 # CONFIG_I2C_ALGOBIT is not set
 CONFIG_I2C_BOARDINFO=y

+CONFIG_I2C_CHARDEV=y

 # CONFIG_I6300ESB_WDT is not set
 # CONFIG_I8K is not set
 # CONFIG_IB700_WDT is not set
 # CONFIG_IBMASR is not set
 # CONFIG_IBM_ASM is not set
 # CONFIG_I6300ESB_WDT is not set
 # CONFIG_I8K is not set
 # CONFIG_IB700_WDT is not set
 # CONFIG_IBMASR is not set
 # CONFIG_IBM_ASM is not set

-CONFIG_IDE=y
-# CONFIG_IDEDMA_IVB is not set
-# CONFIG_IDEDMA_ONLYDISK is not set
-CONFIG_IDEPCI_PCIBUS_ORDER=y
+CONFIG_IDE=m
+# CONFIG_IDEPCI_PCIBUS_ORDER is not set

 CONFIG_IDEPCI_SHARE_IRQ=y
 # CONFIG_IDE_ARM is not set
 CONFIG_IDEPCI_SHARE_IRQ=y
 # CONFIG_IDE_ARM is not set

-# CONFIG_IDE_CHIPSETS is not set
-CONFIG_IDE_GENERIC=y
+CONFIG_IDE_GENERIC=m

 # CONFIG_IDE_PROC_FS is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_IDE_PROC_FS is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_INET6_TUNNEL is not set


@@ -267,7 +238,6 @@ CONFIG_INSTRUMENTATION=y
 # CONFIG_IP_NF_MATCH_AH is not set
 # CONFIG_IP_NF_MATCH_ECN is not set
 # CONFIG_IP_NF_MATCH_IPP2P is not set
 # CONFIG_IP_NF_MATCH_AH is not set
 # CONFIG_IP_NF_MATCH_ECN is not set
 # CONFIG_IP_NF_MATCH_IPP2P is not set

-# CONFIG_IP_NF_MATCH_LAYER7 is not set

 # CONFIG_IP_NF_MATCH_OWNER is not set
 # CONFIG_IP_NF_MATCH_RECENT is not set
 # CONFIG_IP_NF_MATCH_TIME is not set
 # CONFIG_IP_NF_MATCH_OWNER is not set
 # CONFIG_IP_NF_MATCH_RECENT is not set
 # CONFIG_IP_NF_MATCH_TIME is not set


@@ -283,9 +253,7 @@ CONFIG_INSTRUMENTATION=y
 # CONFIG_IP_NF_TARGET_TOS is not set
 # CONFIG_IP_NF_TARGET_TTL is not set
 # CONFIG_IP_NF_TARGET_ULOG is not set
 # CONFIG_IP_NF_TARGET_TOS is not set
 # CONFIG_IP_NF_TARGET_TTL is not set
 # CONFIG_IP_NF_TARGET_ULOG is not set

-CONFIG_IRQBALANCE=y
-CONFIG_ISA=y
-CONFIG_ISAPNP=y
+# CONFIG_ISA is not set

 CONFIG_ISA_DMA_API=y
 # CONFIG_ISDN is not set
 # CONFIG_ISO9660_FS is not set
 CONFIG_ISA_DMA_API=y
 # CONFIG_ISDN is not set
 # CONFIG_ISO9660_FS is not set


@@ -303,10 +271,9 @@ CONFIG_KMOD=y
 # CONFIG_KPROBES is not set
 CONFIG_KTIME_SCALAR=y
 # CONFIG_KVM is not set
 # CONFIG_KPROBES is not set
 CONFIG_KTIME_SCALAR=y
 # CONFIG_KVM is not set

-# CONFIG_LANCE is not set

 CONFIG_LCD_CLASS_DEVICE=y
 CONFIG_LCD_CLASS_DEVICE=y

+# CONFIG_LEDS_ALIX is not set

 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_LOCALVERSION_AUTO=y

-CONFIG_LOCK_KERNEL=y

 # CONFIG_LOGO is not set
 # CONFIG_M386 is not set
 # CONFIG_M486 is not set
 # CONFIG_LOGO is not set
 # CONFIG_M386 is not set
 # CONFIG_M486 is not set


@@ -316,19 +283,17 @@ CONFIG_LOCK_KERNEL=y
 # CONFIG_M686 is not set
 # CONFIG_MACHZ_WDT is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
 # CONFIG_M686 is not set
 # CONFIG_MACHZ_WDT is not set
 # CONFIG_MACINTOSH_DRIVERS is not set

-CONFIG_MATH_EMULATION=y
+# CONFIG_MATH_EMULATION is not set

 # CONFIG_MCA is not set
 # CONFIG_MCORE2 is not set
 # CONFIG_MCRUSOE is not set
 # CONFIG_MCYRIXIII is not set
 # CONFIG_MCA is not set
 # CONFIG_MCORE2 is not set
 # CONFIG_MCRUSOE is not set
 # CONFIG_MCYRIXIII is not set

-# CONFIG_MDA_CONSOLE is not set

 # CONFIG_MEFFICEON is not set
 # CONFIG_MGEODEGX1 is not set
 CONFIG_MGEODE_LX=y
 CONFIG_MICROCODE=y
 CONFIG_MICROCODE_OLD_INTERFACE=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_MEFFICEON is not set
 # CONFIG_MGEODEGX1 is not set
 CONFIG_MGEODE_LX=y
 CONFIG_MICROCODE=y
 CONFIG_MICROCODE_OLD_INTERFACE=y
 # CONFIG_MINIX_FS is not set

-# CONFIG_MIXCOMWD is not set

 # CONFIG_MK6 is not set
 # CONFIG_MK7 is not set
 # CONFIG_MK8 is not set
 # CONFIG_MK6 is not set
 # CONFIG_MK7 is not set
 # CONFIG_MK8 is not set


@@ -383,14 +348,14 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
 # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
 # CONFIG_MTD_MTDRAM is not set
 CONFIG_MTD_NAND=y
 # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
 # CONFIG_MTD_MTDRAM is not set
 CONFIG_MTD_NAND=y

-# CONFIG_MTD_NAND_CAFE is not set
+CONFIG_MTD_NAND_CAFE=y

 # CONFIG_MTD_NAND_CS553X is not set
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_ECC_SMC is not set
 CONFIG_MTD_NAND_IDS=y
 # CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_NANDSIM is not set
 # CONFIG_MTD_NAND_CS553X is not set
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_ECC_SMC is not set
 CONFIG_MTD_NAND_IDS=y
 # CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_NANDSIM is not set

-CONFIG_MTD_NAND_PLATFORM=y
+# CONFIG_MTD_NAND_PLATFORM is not set

 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
 # CONFIG_MTD_ONENAND is not set
 CONFIG_MTD_OOPS=y
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
 # CONFIG_MTD_ONENAND is not set
 CONFIG_MTD_OOPS=y


@@ -404,7 +369,7 @@ CONFIG_MTD_PCI=y
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_TS5500 is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_TS5500 is not set

-CONFIG_MTRR=y
+# CONFIG_MTRR is not set

 # CONFIG_MVIAC3_2 is not set
 # CONFIG_MVIAC7 is not set
 # CONFIG_MWINCHIP2 is not set
 # CONFIG_MVIAC3_2 is not set
 # CONFIG_MVIAC7 is not set
 # CONFIG_MWINCHIP2 is not set


@@ -449,8 +414,6 @@ CONFIG_NETDEV_1000=y
 # CONFIG_NET_SCH_TBF is not set
 # CONFIG_NET_SCH_TEQL is not set
 CONFIG_NET_VENDOR_3COM=y
 # CONFIG_NET_SCH_TBF is not set
 # CONFIG_NET_SCH_TEQL is not set
 CONFIG_NET_VENDOR_3COM=y

-# CONFIG_NET_VENDOR_RACAL is not set
-# CONFIG_NET_VENDOR_SMC is not set

 # CONFIG_NFSD is not set
 # CONFIG_NFS_FS is not set
 # CONFIG_NF_CONNTRACK_AMANDA is not set
 # CONFIG_NFSD is not set
 # CONFIG_NFS_FS is not set
 # CONFIG_NF_CONNTRACK_AMANDA is not set


@@ -466,8 +429,6 @@ CONFIG_NET_VENDOR_3COM=y
 # CONFIG_NF_NAT_SNMP_BASIC is not set
 # CONFIG_NLS is not set
 CONFIG_NOHIGHMEM=y
 # CONFIG_NF_NAT_SNMP_BASIC is not set
 # CONFIG_NLS is not set
 CONFIG_NOHIGHMEM=y

-# CONFIG_NO_HZ is not set
-CONFIG_NR_CPUS=8

 CONFIG_NR_QUICK=1
 CONFIG_NSC_GPIO=m
 CONFIG_NVRAM=y
 CONFIG_NR_QUICK=1
 CONFIG_NSC_GPIO=m
 CONFIG_NVRAM=y


@@ -478,8 +439,7 @@ CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PARAVIRT is not set
 CONFIG_PC8736x_GPIO=m
 # CONFIG_PC87413_WDT is not set
 # CONFIG_PARAVIRT is not set
 CONFIG_PC8736x_GPIO=m
 # CONFIG_PC87413_WDT is not set

-CONFIG_PCCARD=m
-CONFIG_PCCARD_NONSTATIC=m
+CONFIG_PCI=y

 # CONFIG_PCIEPORTBUS is not set
 # CONFIG_PCIPCWATCHDOG is not set
 CONFIG_PCI_DIRECT=y
 # CONFIG_PCIEPORTBUS is not set
 # CONFIG_PCIPCWATCHDOG is not set
 CONFIG_PCI_DIRECT=y


@@ -490,8 +450,6 @@ CONFIG_PCI_DIRECT=y
 CONFIG_PCI_GOOLPC=y
 # CONFIG_PCI_MSI is not set
 CONFIG_PCI_OLPC=y
 CONFIG_PCI_GOOLPC=y
 # CONFIG_PCI_MSI is not set
 CONFIG_PCI_OLPC=y

-CONFIG_PCMCIA_PROBE=y
-# CONFIG_PCWATCHDOG is not set

 # CONFIG_PDA_POWER is not set
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x100000
 # CONFIG_PDA_POWER is not set
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x100000


@@ -499,22 +457,20 @@ CONFIG_PM=y
 CONFIG_PM_DEBUG=y
 CONFIG_PM_LEGACY=y
 CONFIG_PM_SLEEP=y
 CONFIG_PM_DEBUG=y
 CONFIG_PM_LEGACY=y
 CONFIG_PM_SLEEP=y

-CONFIG_PM_SLEEP_SMP=y

 CONFIG_PM_STD_PARTITION=""
 # CONFIG_PM_TRACE is not set
 # CONFIG_PM_VERBOSE is not set
 CONFIG_PM_STD_PARTITION=""
 # CONFIG_PM_TRACE is not set
 # CONFIG_PM_VERBOSE is not set

-CONFIG_PNP=y
-# CONFIG_PNPACPI is not set
-# CONFIG_PNPBIOS is not set
-# CONFIG_PNP_DEBUG is not set

 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 # CONFIG_PPP_MPPE is not set
 # CONFIG_PPP_SYNC_TTY is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 # CONFIG_PPP_MPPE is not set
 # CONFIG_PPP_SYNC_TTY is not set

-CONFIG_PREEMPT_BKL=y
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y

 # CONFIG_PRISM54 is not set
 # CONFIG_PROMFS_FS is not set
 CONFIG_QUICKLIST=y
 # CONFIG_PRISM54 is not set
 # CONFIG_PROMFS_FS is not set
 CONFIG_QUICKLIST=y

+CONFIG_REED_SOLOMON=y
+CONFIG_REED_SOLOMON_DEC16=y

 CONFIG_RELAY=y
 # CONFIG_RELOCATABLE is not set
 CONFIG_RTC=y
 CONFIG_RELAY=y
 # CONFIG_RELOCATABLE is not set
 CONFIG_RTC=y


@@ -523,19 +479,14 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 # CONFIG_SBC_EPX_C3_WATCHDOG is not set
 # CONFIG_SC1200_WDT is not set
 # CONFIG_SC520_WDT is not set
 # CONFIG_SBC_EPX_C3_WATCHDOG is not set
 # CONFIG_SC1200_WDT is not set
 # CONFIG_SC520_WDT is not set

-CONFIG_SCHED_MC=y
-CONFIG_SCHED_SMT=y

 CONFIG_SCSI=y
 CONFIG_SCSI_WAIT_SCAN=m
 CONFIG_SCSI=y
 CONFIG_SCSI_WAIT_SCAN=m

-CONFIG_SCx200=y
-CONFIG_SCx200HR_TIMER=y
+# CONFIG_SCx200 is not set

 # CONFIG_SCx200_ACB is not set
 # CONFIG_SCx200_ACB is not set

-# CONFIG_SCx200_GPIO is not set
-CONFIG_SCx200_WDT=m
+# CONFIG_SDIO_UART is not set

 CONFIG_SEMAPHORE_SLEEPERS=y
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SEMAPHORE_SLEEPERS=y
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SERIAL_8250_PCI=y

-CONFIG_SERIAL_8250_PNP=y

 CONFIG_SERIO=y
 # CONFIG_SERIO_CT82C710 is not set
 CONFIG_SERIO_I8042=y
 CONFIG_SERIO=y
 # CONFIG_SERIO_CT82C710 is not set
 CONFIG_SERIO_I8042=y


@@ -543,24 +494,37 @@ CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_PCIPS2 is not set
 # CONFIG_SERIO_RAW is not set
 CONFIG_SERIO_SERPORT=y
 # CONFIG_SERIO_PCIPS2 is not set
 # CONFIG_SERIO_RAW is not set
 CONFIG_SERIO_SERPORT=y

-CONFIG_SMP=y
+# CONFIG_SMP is not set

 # CONFIG_SMSC37B787_WDT is not set
 # CONFIG_SMSC37B787_WDT is not set

+CONFIG_SND_AC97_CODEC=m
+# CONFIG_SND_CS5530 is not set
+CONFIG_SND_CS5535AUDIO=m

 # CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_SONYPI is not set
 # CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_SONYPI is not set

-# CONFIG_SOUND is not set

 CONFIG_SPARSEMEM_STATIC=y
 CONFIG_SPARSEMEM_STATIC=y

-CONFIG_STOP_MACHINE=y

 CONFIG_SUSPEND=y
 CONFIG_SUSPEND=y

-CONFIG_SUSPEND_SMP_POSSIBLE=y

 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TELCLOCK is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TELCLOCK is not set

-# CONFIG_TICK_ONESHOT is not set
+CONFIG_TICK_ONESHOT=y

 # CONFIG_TOSHIBA is not set
 # CONFIG_TUN is not set
 # CONFIG_TYPHOON is not set
 # CONFIG_UDF_FS is not set
 CONFIG_UID16=y
 # CONFIG_TOSHIBA is not set
 # CONFIG_TUN is not set
 # CONFIG_TYPHOON is not set
 # CONFIG_UDF_FS is not set
 CONFIG_UID16=y

-# CONFIG_USB is not set
+CONFIG_USB=y
+# CONFIG_USBPCWATCHDOG is not set
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_SPLIT_ISO=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_PERSIST is not set
+# CONFIG_USB_R8A66597_HCD is not set
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_SUSPEND is not set
+CONFIG_USB_UHCI_HCD=y

 # CONFIG_USER_NS is not set
 # CONFIG_VFAT_FS is not set
 CONFIG_VGACON_SOFT_SCROLLBACK=y
 # CONFIG_USER_NS is not set
 # CONFIG_VFAT_FS is not set
 CONFIG_VGACON_SOFT_SCROLLBACK=y


@@ -569,7 +533,6 @@ CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
 CONFIG_VGA_CONSOLE=y
 # CONFIG_VGA_NOPROBE is not set
 # CONFIG_VIA_RHINE is not set
 CONFIG_VGA_CONSOLE=y
 # CONFIG_VGA_NOPROBE is not set
 # CONFIG_VIA_RHINE is not set

-# CONFIG_VIDEO_DEV is not set

 CONFIG_VIDEO_SELECT=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_VM86=y
 CONFIG_VIDEO_SELECT=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_VM86=y


@@ -584,7 +547,6 @@ CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
 # CONFIG_WAFER_WDT is not set
 CONFIG_VT_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
 # CONFIG_WAFER_WDT is not set

-# CONFIG_WDT is not set

 CONFIG_X86=y
 CONFIG_X86_32=y
 # CONFIG_X86_BIGSMP is not set
 CONFIG_X86=y
 CONFIG_X86_32=y
 # CONFIG_X86_BIGSMP is not set


@@ -597,15 +559,12 @@ CONFIG_X86_CMPXCHG=y
 CONFIG_X86_FIND_SMP_CONFIG=y
 CONFIG_X86_GENERIC=y
 # CONFIG_X86_GENERICARCH is not set
 CONFIG_X86_FIND_SMP_CONFIG=y
 CONFIG_X86_GENERIC=y
 # CONFIG_X86_GENERICARCH is not set

-CONFIG_X86_HT=y

 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_INVLPG=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_L1_CACHE_SHIFT=7
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_INVLPG=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_L1_CACHE_SHIFT=7
 CONFIG_X86_LOCAL_APIC=y

-CONFIG_X86_MCE=y
-# CONFIG_X86_MCE_NONFATAL is not set
-# CONFIG_X86_MCE_P4THERMAL is not set
+# CONFIG_X86_MCE is not set

 CONFIG_X86_MINIMUM_CPU_FAMILY=4
 CONFIG_X86_MPPARSE=y
 # CONFIG_X86_MSR is not set
 CONFIG_X86_MINIMUM_CPU_FAMILY=4
 CONFIG_X86_MPPARSE=y
 # CONFIG_X86_MSR is not set


@@ -614,10 +573,10 @@ CONFIG_X86_MPPARSE=y
 CONFIG_X86_PC=y
 CONFIG_X86_POPAD_OK=y
 # CONFIG_X86_REBOOTFIXUPS is not set
 CONFIG_X86_PC=y
 CONFIG_X86_POPAD_OK=y
 # CONFIG_X86_REBOOTFIXUPS is not set

-CONFIG_X86_SMP=y

 # CONFIG_X86_SUMMIT is not set
 # CONFIG_X86_SUMMIT is not set

-CONFIG_X86_TRAMPOLINE=y

 CONFIG_X86_TSC=y
 CONFIG_X86_TSC=y

+CONFIG_X86_UP_APIC=y
+CONFIG_X86_UP_IOAPIC=y

 CONFIG_X86_USE_3DNOW=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y
 # CONFIG_X86_VISWS is not set
 CONFIG_X86_USE_3DNOW=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y
 # CONFIG_X86_VISWS is not set


@@ -625,8 +584,3 @@ CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_X86_WP_WORKS_OK=y
 CONFIG_X86_XADD=y
 # CONFIG_XFS_FS is not set
 CONFIG_X86_WP_WORKS_OK=y
 CONFIG_X86_XADD=y
 # CONFIG_XFS_FS is not set

-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_TOSHIBA=y