fonera-mp3: fix json-c dependency here as well

[openwrt.git] / target / linux / at91-2.6 / config / default

diff --git a/target/linux/at91-2.6/config/default b/target/linux/at91-2.6/config/default
index 9633fb2..5e74bd6 100644 (file)
--- a/target/linux/at91-2.6/config/default
+++ b/target/linux/at91-2.6/config/default
@@ -1,30 +1,37 @@
 # CONFIG_AEABI is not set
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_AEABI is not set
 CONFIG_ALIGNMENT_TRAP=y

-# CONFIG_APM is not set

 # CONFIG_ARCH_AAEC2000 is not set
 CONFIG_ARCH_AT91=y
 CONFIG_ARCH_AT91RM9200=y
 # CONFIG_ARCH_AT91RM9200DK is not set
 # CONFIG_ARCH_AT91SAM9260 is not set
 # CONFIG_ARCH_AT91SAM9261 is not set
 # CONFIG_ARCH_AAEC2000 is not set
 CONFIG_ARCH_AT91=y
 CONFIG_ARCH_AT91RM9200=y
 # CONFIG_ARCH_AT91RM9200DK is not set
 # CONFIG_ARCH_AT91SAM9260 is not set
 # CONFIG_ARCH_AT91SAM9261 is not set

+# CONFIG_ARCH_AT91SAM9263 is not set
+# CONFIG_ARCH_AT91SAM9RL is not set

 # CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_CLPS7500 is not set
 # CONFIG_ARCH_CO285 is not set
 # CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_CLPS7500 is not set
 # CONFIG_ARCH_CO285 is not set

+# CONFIG_ARCH_DAVINCI is not set

 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 # CONFIG_ARCH_EBSA110 is not set
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
 # CONFIG_ARCH_H720X is not set
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 # CONFIG_ARCH_EBSA110 is not set
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
 # CONFIG_ARCH_H720X is not set

+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set

 # CONFIG_ARCH_IMX is not set
 # CONFIG_ARCH_INTEGRATOR is not set
 # CONFIG_ARCH_IMX is not set
 # CONFIG_ARCH_INTEGRATOR is not set

+# CONFIG_ARCH_IOP13XX is not set

 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP23XX is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP23XX is not set
 # CONFIG_ARCH_IXP4XX is not set

+# CONFIG_ARCH_KS8695 is not set

 # CONFIG_ARCH_L7200 is not set
 # CONFIG_ARCH_LH7A40X is not set
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_L7200 is not set
 # CONFIG_ARCH_LH7A40X is not set
 # CONFIG_ARCH_NETX is not set

+# CONFIG_ARCH_NS9XXX is not set

 # CONFIG_ARCH_OMAP is not set
 # CONFIG_ARCH_PNX4008 is not set
 # CONFIG_ARCH_PXA is not set
 # CONFIG_ARCH_OMAP is not set
 # CONFIG_ARCH_PNX4008 is not set
 # CONFIG_ARCH_PXA is not set


@@ -33,6 +40,7 @@ CONFIG_ARCH_AT91RM9200=y
 # CONFIG_ARCH_S3C2410 is not set
 # CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_SHARK is not set
 # CONFIG_ARCH_S3C2410 is not set
 # CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_SHARK is not set

+# CONFIG_ARCH_SUPPORTS_MSI is not set

 # CONFIG_ARCH_VERSATILE is not set
 CONFIG_ARM=y
 CONFIG_ARM_AT91_ETHER=y
 # CONFIG_ARCH_VERSATILE is not set
 CONFIG_ARM=y
 CONFIG_ARM_AT91_ETHER=y


@@ -41,11 +49,14 @@ CONFIG_ARM_THUMB=y
 # CONFIG_ARTHUR is not set
 # CONFIG_AT91_PROGRAMMABLE_CLOCKS is not set
 CONFIG_AT91_SPI=y
 # CONFIG_ARTHUR is not set
 # CONFIG_AT91_PROGRAMMABLE_CLOCKS is not set
 CONFIG_AT91_SPI=y

-CONFIG_AT91_SPIDEV=y
+# CONFIG_AT91_SPIDEV is not set
+# CONFIG_ATMEL_TCLIB is not set
+CONFIG_ATM_DRIVERS=y

 # CONFIG_ATM_DUMMY is not set
 # CONFIG_ATM_TCP is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_BINFMT_AOUT is not set
 # CONFIG_ATM_DUMMY is not set
 # CONFIG_ATM_TCP is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_BINFMT_AOUT is not set

+CONFIG_BITREVERSE=y

 # CONFIG_BLK_DEV_LOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
 CONFIG_BLK_DEV_RAM=y
 # CONFIG_BLK_DEV_LOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
 CONFIG_BLK_DEV_RAM=y


@@ -53,10 +64,11 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 # CONFIG_BONDING is not set
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 # CONFIG_BONDING is not set

-# CONFIG_BRIDGE_NETFILTER is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_BSD_DISKLABEL is not set

 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_BT is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_BT is not set

-# CONFIG_CIFS is not set
+# CONFIG_CIFS_STATS is not set

 # CONFIG_CLS_U32_MARK is not set
 # CONFIG_CLS_U32_PERF is not set
 # CONFIG_CONFIGFS_FS is not set
 # CONFIG_CLS_U32_MARK is not set
 # CONFIG_CLS_U32_PERF is not set
 # CONFIG_CONFIGFS_FS is not set


@@ -73,9 +85,6 @@ CONFIG_CPU_CP15_MMU=y
 # CONFIG_CPU_DCACHE_WRITETHROUGH is not set
 # CONFIG_CPU_ICACHE_DISABLE is not set
 CONFIG_CPU_TLB_V4WBI=y
 # CONFIG_CPU_DCACHE_WRITETHROUGH is not set
 # CONFIG_CPU_ICACHE_DISABLE is not set
 CONFIG_CPU_TLB_V4WBI=y

-CONFIG_CRC32=m
-# CONFIG_CRYPTO_AES is not set
-CONFIG_CRYPTO_ALGAPI=m

 # CONFIG_CRYPTO_ANUBIS is not set
 CONFIG_CRYPTO_BLKCIPHER=m
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 CONFIG_CRYPTO_BLKCIPHER=m
 # CONFIG_CRYPTO_BLOWFISH is not set


@@ -84,11 +93,11 @@ CONFIG_CRYPTO_BLKCIPHER=m
 CONFIG_CRYPTO_CBC=m
 # CONFIG_CRYPTO_CRC32C is not set
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_CBC=m
 # CONFIG_CRYPTO_CRC32C is not set
 CONFIG_CRYPTO_DES=m

+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HMAC=y

 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_KHAZAD is not set

-CONFIG_CRYPTO_MANAGER=m

 # CONFIG_CRYPTO_MD4 is not set
 CONFIG_CRYPTO_MD5=m
 # CONFIG_CRYPTO_MD4 is not set
 CONFIG_CRYPTO_MD5=m

-# CONFIG_CRYPTO_MICHAEL_MIC is not set

 # CONFIG_CRYPTO_NULL is not set
 # CONFIG_CRYPTO_SERPENT is not set
 # CONFIG_CRYPTO_SHA256 is not set
 # CONFIG_CRYPTO_NULL is not set
 # CONFIG_CRYPTO_SERPENT is not set
 # CONFIG_CRYPTO_SHA256 is not set


@@ -100,50 +109,30 @@ CONFIG_CRYPTO_MD5=m
 # CONFIG_CRYPTO_WP512 is not set
 CONFIG_DAVICOM_PHY=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_CRYPTO_WP512 is not set
 CONFIG_DAVICOM_PHY=y
 # CONFIG_DEBUG_BUGVERBOSE is not set

-CONFIG_DEBUG_DRIVER=y
-# CONFIG_DEBUG_ERRORS is not set
-# CONFIG_DEBUG_INFO is not set
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_LL is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_RWSEMS is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

 # CONFIG_DEBUG_USER is not set
 # CONFIG_DEBUG_USER is not set

-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_WAITQ is not set
-CONFIG_DETECT_SOFTLOCKUP=y

 # CONFIG_DM9000 is not set
 # CONFIG_DM9000 is not set

-CONFIG_DNOTIFY=y

 CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY_CONSOLE=y

-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_FIRMWARE_EDID is not set

 # CONFIG_FIXED_PHY is not set
 # CONFIG_FIXED_PHY is not set

-CONFIG_FORCED_INLINING=y

 # CONFIG_FPE_FASTFPE is not set
 CONFIG_FPE_NWFPE=y
 # CONFIG_FPE_NWFPE_XP is not set
 CONFIG_FRAME_POINTER=y
 # CONFIG_FPE_FASTFPE is not set
 CONFIG_FPE_NWFPE=y
 # CONFIG_FPE_NWFPE_XP is not set
 CONFIG_FRAME_POINTER=y

-# CONFIG_FW_LOADER is not set
+CONFIG_FS_POSIX_ACL=y
+CONFIG_FW_LOADER=m
+# CONFIG_GENERIC_CLOCKEVENTS is not set
+CONFIG_GENERIC_GPIO=y

 # CONFIG_GENERIC_TIME is not set
 CONFIG_HARDIRQS_SW_RESEND=y
 # CONFIG_GENERIC_TIME is not set
 CONFIG_HARDIRQS_SW_RESEND=y

-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_HFS_FS is not set
+CONFIG_HAS_DMA=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HID=y

 CONFIG_HW_CONSOLE=y
 # CONFIG_HW_RANDOM is not set
 CONFIG_HW_CONSOLE=y
 # CONFIG_HW_RANDOM is not set

-CONFIG_HZ=100

 # CONFIG_I2C is not set
 # CONFIG_I2C is not set

-# CONFIG_IEEE80211 is not set

 # CONFIG_IKCONFIG is not set
 CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_IKCONFIG is not set
 CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_INITRAMFS_SOURCE=""

-# CONFIG_INOTIFY is not set

 CONFIG_INPUT=y
 # CONFIG_INPUT_EVDEV is not set
 CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT=y
 # CONFIG_INPUT_EVDEV is not set
 CONFIG_INPUT_MOUSEDEV=y


@@ -158,40 +147,40 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_IP6_NF_RAW is not set
 # CONFIG_IP6_NF_TARGET_HL is not set
 # CONFIG_IP6_NF_TARGET_LOG is not set
 # CONFIG_IP6_NF_RAW is not set
 # CONFIG_IP6_NF_TARGET_HL is not set
 # CONFIG_IP6_NF_TARGET_LOG is not set

-# CONFIG_IP_DCCP is not set

 # CONFIG_IP_NF_ARPTABLES is not set
 # CONFIG_IP_NF_ARPTABLES is not set

-# CONFIG_IP_NF_CT_PROTO_SCTP is not set

 # CONFIG_IP_NF_MATCH_ADDRTYPE is not set
 # CONFIG_IP_NF_MATCH_ADDRTYPE is not set

-# CONFIG_IP_NF_MATCH_HASHLIMIT is not set

 # CONFIG_IP_NF_TARGET_LOG is not set
 # CONFIG_IP_NF_TARGET_NETMAP is not set
 # CONFIG_IP_NF_TARGET_SAME is not set
 # CONFIG_IP_NF_TARGET_LOG is not set
 # CONFIG_IP_NF_TARGET_NETMAP is not set
 # CONFIG_IP_NF_TARGET_SAME is not set

-# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set

 # CONFIG_IP_ROUTE_VERBOSE is not set
 # CONFIG_IP_ROUTE_VERBOSE is not set

-# CONFIG_ISO9660_FS is not set
-# CONFIG_JFFS2_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_LEDS is not set
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_LEDS=y
+CONFIG_LEDS_CPU=y
+CONFIG_LEDS_TIMER=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=32

 # CONFIG_LIBCRC32C is not set
 # CONFIG_LLC2 is not set
 # CONFIG_LIBCRC32C is not set
 # CONFIG_LLC2 is not set

-# CONFIG_LOCALVERSION_AUTO is not set

 # CONFIG_MACH_AT91RM9200EK is not set
 # CONFIG_MACH_ATEB9200 is not set
 # CONFIG_MACH_CARMEVA is not set
 # CONFIG_MACH_AT91RM9200EK is not set
 # CONFIG_MACH_ATEB9200 is not set
 # CONFIG_MACH_CARMEVA is not set

+# CONFIG_MACH_CHUB is not set

 # CONFIG_MACH_CSB337 is not set
 # CONFIG_MACH_CSB637 is not set
 # CONFIG_MACH_KAFA is not set
 # CONFIG_MACH_KB9200 is not set
 # CONFIG_MACH_ONEARM is not set
 # CONFIG_MACH_CSB337 is not set
 # CONFIG_MACH_CSB637 is not set
 # CONFIG_MACH_KAFA is not set
 # CONFIG_MACH_KB9200 is not set
 # CONFIG_MACH_ONEARM is not set

-CONFIG_MACH_VLINK=y
-# CONFIG_MINIX_FS is not set
-CONFIG_MINI_FO=y
-# CONFIG_MODULE_UNLOAD is not set
-# CONFIG_MSDOS_FS is not set
+# CONFIG_MACH_PICOTUX2XX is not set
+CONFIG_MMC=m
+CONFIG_MMC_AT91=m
+CONFIG_MMC_BLOCK=m
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set

 CONFIG_MTD=y
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AFS_PARTS is not set
 CONFIG_MTD_AT91_DATAFLASH=y
 CONFIG_MTD=y
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AFS_PARTS is not set
 CONFIG_MTD_AT91_DATAFLASH=y

+CONFIG_MTD_BLKDEVS=y

 CONFIG_MTD_BLOCK=y
 # CONFIG_MTD_BLOCK2MTD is not set
 # CONFIG_MTD_CFI is not set
 CONFIG_MTD_BLOCK=y
 # CONFIG_MTD_BLOCK2MTD is not set
 # CONFIG_MTD_CFI is not set


@@ -200,16 +189,15 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_CFI_I4 is not set
 # CONFIG_MTD_CFI_I8 is not set
 CONFIG_MTD_CHAR=y
 # CONFIG_MTD_CFI_I4 is not set
 # CONFIG_MTD_CFI_I8 is not set
 CONFIG_MTD_CHAR=y

-# CONFIG_MTD_CMDLINE_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y

 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 # CONFIG_MTD_CONCAT is not set
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 # CONFIG_MTD_CONCAT is not set

-CONFIG_MTD_DATAFLASH=y
+# CONFIG_MTD_DATAFLASH26 is not set

 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
 # CONFIG_MTD_JEDECPROBE is not set
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
 # CONFIG_MTD_JEDECPROBE is not set

-# CONFIG_MTD_M25P80 is not set

 CONFIG_MTD_MAP_BANK_WIDTH_1=y
 # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
 CONFIG_MTD_MAP_BANK_WIDTH_2=y
 CONFIG_MTD_MAP_BANK_WIDTH_1=y
 # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
 CONFIG_MTD_MAP_BANK_WIDTH_2=y


@@ -217,8 +205,6 @@ CONFIG_MTD_MAP_BANK_WIDTH_2=y
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
 # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
 # CONFIG_MTD_MTDRAM is not set
 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 is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set

 # CONFIG_MTD_ONENAND is not set
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_ONENAND is not set
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_PHRAM is not set


@@ -226,45 +212,31 @@ CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set

+# CONFIG_MTD_ROOTFS_ROOT_DEV is not set
+# CONFIG_MTD_ROOTFS_SPLIT is not set

 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_SLRAM is not set

-# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
-# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
-# CONFIG_NETFILTER_XT_MATCH_REALM is not set
-# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
-# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
-# CONFIG_NET_CLS_ACT is not set
-# CONFIG_NET_CLS_IND is not set
+CONFIG_NETDEV_1000=y

 # CONFIG_NET_EMATCH is not set
 # CONFIG_NET_IPGRE_BROADCAST is not set
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_NET_EMATCH is not set
 # CONFIG_NET_IPGRE_BROADCAST is not set
 # CONFIG_NET_PKTGEN is not set

-# CONFIG_NET_RADIO is not set
+CONFIG_NET_SCH_FIFO=y

 # CONFIG_NET_SCH_NETEM is not set
 # CONFIG_NEW_LEDS is not set
 # CONFIG_NET_SCH_NETEM is not set
 # CONFIG_NEW_LEDS is not set

-# CONFIG_NFSD is not set
-# CONFIG_NFS_FS is not set
-# CONFIG_NLS is not set

 # CONFIG_NO_IDLE_HZ is not set
 # CONFIG_NO_IDLE_HZ is not set

-# CONFIG_NTFS_FS is not set
+# CONFIG_NO_IOPORT is not set

 # CONFIG_NVRAM is not set
 # CONFIG_NVRAM is not set

-# CONFIG_PARTITION_ADVANCED is not set
-# CONFIG_PCCARD is not set
+# CONFIG_OUTER_CACHE is not set

 CONFIG_PHYLIB=y
 CONFIG_PHYLIB=y

-# CONFIG_PM is not set
+# CONFIG_PNPACPI is not set

 # CONFIG_PPPOATM is not set
 # CONFIG_PPP_MULTILINK is not set
 # CONFIG_PPP_SYNC_TTY is not set
 # CONFIG_QSEMI_PHY is not set
 # CONFIG_PPPOATM is not set
 # CONFIG_PPP_MULTILINK is not set
 # CONFIG_PPP_SYNC_TTY is not set
 # CONFIG_QSEMI_PHY is not set

-# CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_REISERFS_FS is not set

 # CONFIG_ROMFS_FS is not set
 CONFIG_RTC_LIB=y
 # CONFIG_ROMFS_FS is not set
 CONFIG_RTC_LIB=y

-# CONFIG_RT_MUTEX_TESTER is not set

 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y

-# CONFIG_SCHEDSTATS is not set
-# CONFIG_SCSI is not set
+# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI_WAIT_SCAN=m

 # CONFIG_SERIAL_8250 is not set
 CONFIG_SERIAL_ATMEL=y
 CONFIG_SERIAL_ATMEL_CONSOLE=y
 # CONFIG_SERIAL_8250 is not set
 CONFIG_SERIAL_ATMEL=y
 CONFIG_SERIAL_ATMEL_CONSOLE=y


@@ -273,31 +245,61 @@ CONFIG_SERIO=y
 # CONFIG_SERIO_LIBPS2 is not set
 CONFIG_SERIO_RAW=y
 CONFIG_SERIO_SERPORT=y
 # CONFIG_SERIO_LIBPS2 is not set
 CONFIG_SERIO_RAW=y
 CONFIG_SERIO_SERPORT=y

-# CONFIG_SMB_FS is not set

 # CONFIG_SMC91X is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_SOUND is not set
 # CONFIG_SPARSEMEM_STATIC is not set
 # CONFIG_SMC91X is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_SOUND is not set
 # CONFIG_SPARSEMEM_STATIC is not set

-CONFIG_SPI=y
-CONFIG_SPI_ATMEL=y
-CONFIG_SPI_BITBANG=y
-CONFIG_SPI_DEBUG=y
-CONFIG_SPI_MASTER=y

 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SPLIT_PTLOCK_CPUS=4096

-# CONFIG_UDF_FS is not set
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+# CONFIG_TICK_ONESHOT is not set

 CONFIG_UID16=y
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_UID16=y
 # CONFIG_UNUSED_SYMBOLS is not set

-# CONFIG_USB is not set

 # CONFIG_USB_ARCH_HAS_EHCI is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set

+# CONFIG_USB_ATM is not set
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+CONFIG_USB_LIBUSUAL=y
+CONFIG_USB_MON=y
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_PRINTER is not set
+# CONFIG_USB_SERIAL_EDGEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
+# CONFIG_USB_SERIAL_FUNSOFT is not set
+# CONFIG_USB_SERIAL_GARMIN is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
+# CONFIG_USB_SERIAL_IPW is not set
+# CONFIG_USB_SERIAL_IR is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+# CONFIG_USB_SERIAL_KLSI is not set
+# CONFIG_USB_SERIAL_KOBIL_SCT is not set
+# CONFIG_USB_SERIAL_MCT_U232 is not set
+# CONFIG_USB_SERIAL_OMNINET is not set
+# CONFIG_USB_SERIAL_OPTION is not set
+# CONFIG_USB_SERIAL_SAFE is not set
+# CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_USB_USBNET_MII is not set

 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_VECTORS_BASE=0xffff0000

-# CONFIG_VFAT_FS is not set
+# CONFIG_VGASTATE is not set

 # CONFIG_VGA_CONSOLE is not set
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
 # CONFIG_WATCHDOG is not set

-# CONFIG_XFS_FS is not set

 # CONFIG_XIP_KERNEL is not set
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ZBOOT_ROM_TEXT=0x0
 # CONFIG_XIP_KERNEL is not set
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ZBOOT_ROM_TEXT=0x0

-CONFIG_ZLIB_DEFLATE=m