upgrade iop32x to 2.6.26.2

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12338 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/iop32x/Makefile b/target/linux/iop32x/Makefile
index f7556c2..12dc599 100644 (file)
--- a/target/linux/iop32x/Makefile
+++ b/target/linux/iop32x/Makefile
@@ -11,7 +11,7 @@ BOARD:=iop32x
 BOARDNAME:=Intel IOP32x
 FEATURES:=squashfs jffs2
 
 BOARDNAME:=Intel IOP32x
 FEATURES:=squashfs jffs2
 

-LINUX_VERSION:=2.6.24.7
+LINUX_VERSION:=2.6.26.2

 
 include $(INCLUDE_DIR)/target.mk
 
 
 include $(INCLUDE_DIR)/target.mk
 

diff --git a/target/linux/iop32x/config-default b/target/linux/iop32x/config-default
index 1203491..e4ecfe1 100644 (file)
--- a/target/linux/iop32x/config-default
+++ b/target/linux/iop32x/config-default
@@ -1,7 +1,6 @@
 # CONFIG_8139TOO is not set
 # CONFIG_8139TOO is not set

-CONFIG_AEABI=y
+# CONFIG_AEABI is not set

 CONFIG_ALIGNMENT_TRAP=y
 CONFIG_ALIGNMENT_TRAP=y

-# CONFIG_APM is not set

 # CONFIG_ARCH_AAEC2000 is not set
 # CONFIG_ARCH_AT91 is not set
 # CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_AAEC2000 is not set
 # CONFIG_ARCH_AT91 is not set
 # CONFIG_ARCH_CLPS711X is not set


@@ -13,23 +12,27 @@ CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
 # CONFIG_ARCH_H720X 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_IOP13XX is not set
 CONFIG_ARCH_IOP32X=y
 # CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IMX is not set
 # CONFIG_ARCH_INTEGRATOR is not set
 # CONFIG_ARCH_IOP13XX is not set
 CONFIG_ARCH_IOP32X=y
 # CONFIG_ARCH_IOP33X is not set

-# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_IQ31244 is not set
+# CONFIG_ARCH_IQ80321 is not set

 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP23XX is not set
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP23XX is not set

-# CONFIG_ARCH_IQ80321 is not set
-# CONFIG_ARCH_IQ31244 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_KS8695 is not set
 # CONFIG_ARCH_L7200 is not set
 # CONFIG_ARCH_LH7A40X is not set

+# CONFIG_ARCH_MSM7X00A is not set

 # CONFIG_ARCH_MXC is not set
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_NS9XXX is not set
 # CONFIG_ARCH_OMAP is not set
 # CONFIG_ARCH_MXC is not set
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_NS9XXX is not set
 # CONFIG_ARCH_OMAP is not set

+# CONFIG_ARCH_ORION5X is not set

 # CONFIG_ARCH_PNX4008 is not set
 # CONFIG_ARCH_PXA is not set
 # CONFIG_ARCH_REALVIEW is not set
 # CONFIG_ARCH_PNX4008 is not set
 # CONFIG_ARCH_PXA is not set
 # CONFIG_ARCH_REALVIEW is not set


@@ -37,65 +40,85 @@ CONFIG_ARCH_IOP32X=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_AOUT=y
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+CONFIG_ARCH_SUSPEND_POSSIBLE=y

 # CONFIG_ARCH_VERSATILE is not set
 CONFIG_ARM=y
 # CONFIG_ARM_THUMB is not set
 # CONFIG_ARPD is not set
 # CONFIG_ARCH_VERSATILE is not set
 CONFIG_ARM=y
 # CONFIG_ARM_THUMB is not set
 # CONFIG_ARPD is not set

-CONFIG_ARTHUR=n
+# CONFIG_ARTHUR is not set
+CONFIG_ASYNC_CORE=y

 CONFIG_ATA=m
 CONFIG_ATA=m

-# CONFIG_ATA_GENERIC is not set
-# CONFIG_ATA_PIIX is not set
+# CONFIG_ATA_NONSTANDARD is not set

 # CONFIG_ATM is not set
 # CONFIG_ATMEL is not set
 # CONFIG_ATM is not set
 # CONFIG_ATMEL is not set

-# CONFIG_B44 is not set

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

+CONFIG_BITREVERSE=y

 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BONDING is not set
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BONDING is not set

-# CONFIG_BRIDGE_NF_EBTABLES is not set
+CONFIG_BOUNCE=y

 # CONFIG_BSD_DISKLABEL is not set
 # CONFIG_BT is not set
 # CONFIG_CIFS_STATS is not set
 # CONFIG_BSD_DISKLABEL is not set
 # CONFIG_BT is not set
 # CONFIG_CIFS_STATS is not set

+CONFIG_CLASSIC_RCU=y

 CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200 init=/etc/preinit"
 # CONFIG_CONFIGFS_FS is not set
 CONFIG_CPU_32=y
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200 init=/etc/preinit"
 # CONFIG_CONFIGFS_FS is not set
 CONFIG_CPU_32=y
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y

-CONFIG_CPU_BIG_ENDIAN=y

 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_CP15=y
 CONFIG_CPU_CP15_MMU=y
 # CONFIG_CPU_DCACHE_DISABLE is not set
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_CP15=y
 CONFIG_CPU_CP15_MMU=y
 # CONFIG_CPU_DCACHE_DISABLE is not set

+CONFIG_CPU_PABRT_NOIFAR=y

 CONFIG_CPU_TLB_V4WBI=y
 CONFIG_CPU_XSCALE=y
 CONFIG_CRC16=y
 # CONFIG_CRC_CCITT is not set
 CONFIG_CPU_TLB_V4WBI=y
 CONFIG_CPU_XSCALE=y
 CONFIG_CRC16=y
 # CONFIG_CRC_CCITT is not set

+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_GF128MUL=m

 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_USER is not set
 CONFIG_DEFAULT_TCP_CONG="westwood"
 # CONFIG_DEFAULT_VEGAS is not set
 CONFIG_DEFAULT_WESTWOOD=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_USER is not set
 CONFIG_DEFAULT_TCP_CONG="westwood"
 # CONFIG_DEFAULT_VEGAS is not set
 CONFIG_DEFAULT_WESTWOOD=y

+CONFIG_DEVPORT=y

 CONFIG_DLCI=m
 CONFIG_DLCI=m

-CONFIG_DLCI_COUNT=24

 CONFIG_DLCI_MAX=8
 # CONFIG_DM9000 is not set
 CONFIG_DMADEVICES=y
 CONFIG_DLCI_MAX=8
 # CONFIG_DM9000 is not set
 CONFIG_DMADEVICES=y

+CONFIG_DMA_ENGINE=y

 CONFIG_DNOTIFY=y
 # CONFIG_DSCC4 is not set
 # CONFIG_E100 is not set
 CONFIG_E1000=y
 CONFIG_DNOTIFY=y
 # CONFIG_DSCC4 is not set
 # CONFIG_E100 is not set
 CONFIG_E1000=y

+# CONFIG_E1000E_ENABLED is not set

 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 CONFIG_E1000_NAPI=y
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 CONFIG_E1000_NAPI=y

-# CONFIG_E1000E is not set

 # CONFIG_FARSYNC is not set
 # CONFIG_FARSYNC is not set

-CONFIG_FIRMWARE_EDID=y
-CONFIG_FPE_FASTFPE=n
-CONFIG_FPE_NWFPE=n
-# CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_FPE_FASTFPE is not set
+# CONFIG_FPE_NWFPE is not set

 CONFIG_FRAME_POINTER=y
 CONFIG_FRAME_POINTER=y

+CONFIG_FS_POSIX_ACL=y
+# CONFIG_GENERIC_CLOCKEVENTS is not set
+# CONFIG_GENERIC_FIND_FIRST_BIT is not set
+# CONFIG_GENERIC_FIND_NEXT_BIT is not set
+# CONFIG_GENERIC_GPIO is not set
+# CONFIG_GENERIC_TIME is not set

 # CONFIG_HAMRADIO is not set
 CONFIG_HARDIRQS_SW_RESEND=y
 # CONFIG_HAMRADIO is not set
 CONFIG_HARDIRQS_SW_RESEND=y

+CONFIG_HAS_DMA=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+# CONFIG_HAVE_DMA_ATTRS is not set
+CONFIG_HAVE_IDE=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPROFILE=y

 CONFIG_HDLC=m
 CONFIG_HDLC_CISCO=m
 CONFIG_HDLC_FR=m
 CONFIG_HDLC=m
 CONFIG_HDLC_CISCO=m
 CONFIG_HDLC_FR=m


@@ -106,96 +129,72 @@ CONFIG_HDLC_RAW=m
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_HW_RANDOM=y
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_HW_RANDOM=y

-CONFIG_HZ=100

 CONFIG_I2C=y
 CONFIG_I2C=y

-CONFIG_I2C_ALGOBIT=y
-# CONFIG_I2C_ALGOPCA is not set
-# CONFIG_I2C_ALGOPCF is not set
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
+CONFIG_I2C_BOARDINFO=y

 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_CHARDEV=y

-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_I801 is not set
-# CONFIG_I2C_I810 is not set

 # CONFIG_I2C_IOP3XX is not set
 # CONFIG_I2C_IOP3XX is not set

-# CONFIG_I2C_NFORCE2 is not set
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PCA_ISA is not set
-# CONFIG_I2C_PIIX4 is not set
-# CONFIG_I2C_PROSAVAGE is not set
-# CONFIG_I2C_SAVAGE4 is not set
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_SIS630 is not set
-# CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
-# CONFIG_I2C_VOODOO3 is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set

 # CONFIG_IDE is not set
 # CONFIG_IDE is not set

-# CONFIG_IEEE80211_SOFTMAC is not set
-# CONFIG_IKCONFIG is not set

 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INTEL_IOP_ADMA=y
 # CONFIG_IOP_WATCHDOG is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INTEL_IOP_ADMA=y
 # CONFIG_IOP_WATCHDOG is not set

-CONFIG_IOP3XX_ATU=y
-# CONFIG_IP1000 is not set

 # CONFIG_IP6_NF_MANGLE is not set
 # CONFIG_IP6_NF_MATCH_EUI64 is not set
 # CONFIG_IP6_NF_MATCH_FRAG is not set
 # CONFIG_IP6_NF_MATCH_HL is not set
 # CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
 # CONFIG_IP6_NF_MATCH_OPTS is not set
 # CONFIG_IP6_NF_MANGLE is not set
 # CONFIG_IP6_NF_MATCH_EUI64 is not set
 # CONFIG_IP6_NF_MATCH_FRAG is not set
 # CONFIG_IP6_NF_MATCH_HL is not set
 # CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
 # CONFIG_IP6_NF_MATCH_OPTS is not set

-# CONFIG_IP6_NF_MATCH_OWNER is not set

 # CONFIG_IP6_NF_MATCH_RT is not set
 # CONFIG_IP6_NF_TARGET_LOG is not set
 # CONFIG_IP6_NF_MATCH_RT is not set
 # CONFIG_IP6_NF_TARGET_LOG is not set

+CONFIG_IPV6_NDISC_NODETYPE=y

 # CONFIG_IPV6_ROUTER_PREF is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
 # CONFIG_IPV6_ROUTER_PREF is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set

-# CONFIG_IP_DCCP is not set

 CONFIG_IP_MROUTE=y
 CONFIG_IP_MROUTE=y

-# CONFIG_IP_NF_AMANDA 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_ECN is not set
 # CONFIG_IP_NF_MATCH_ADDRTYPE is not set
 # CONFIG_IP_NF_MATCH_ECN is not set

-# CONFIG_IP_NF_MATCH_HASHLIMIT is not set

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

-# CONFIG_IP_NF_PPTP is not set

 # CONFIG_IP_NF_SET is not set
 # CONFIG_IP_NF_TARGET_ECN is not set
 # CONFIG_IP_NF_TARGET_LOG is not set
 # CONFIG_IP_NF_TARGET_NETMAP is not set
 # CONFIG_IP_NF_SET is not set
 # CONFIG_IP_NF_TARGET_ECN is not set
 # CONFIG_IP_NF_TARGET_LOG is not set
 # CONFIG_IP_NF_TARGET_NETMAP is not set

-CONFIG_IP_NF_TARGET_REDIRECT=m
-# CONFIG_IP_NF_TARGET_SAME is not set

 # CONFIG_IP_NF_TARGET_TTL is not set
 # CONFIG_IP_NF_TARGET_ULOG is not set
 # CONFIG_IP_NF_TARGET_TTL is not set
 # CONFIG_IP_NF_TARGET_ULOG is not set

-# CONFIG_IP_NF_TFTP is not set

 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y

+# CONFIG_IWLWIFI_LEDS is not set

 # CONFIG_IWMMXT is not set
 # CONFIG_IWMMXT is not set

-# CONFIG_JFS_FS is not set

 # CONFIG_LANMEDIA is not set
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_LANMEDIA is not set
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256

-# CONFIG_LIBCRC32C is not set

 # CONFIG_LLC2 is not set
 # CONFIG_LLC2 is not set

-# CONFIG_MAC_PARTITION is not set
+CONFIG_LZO_COMPRESS=m
+CONFIG_LZO_DECOMPRESS=m

 # CONFIG_MACH_EM7210 is not set
 # CONFIG_MACH_GLANTANK is not set
 CONFIG_MACH_N2100=y
 # CONFIG_MACH_EM7210 is not set
 # CONFIG_MACH_GLANTANK is not set
 CONFIG_MACH_N2100=y

+# CONFIG_MAC_PARTITION is not set
+# CONFIG_MEDIA_ATTACH is not set
+CONFIG_MEDIA_TUNER=m
+# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m

 # CONFIG_MINIX_FS is not set
 # CONFIG_MINIX_FS is not set

-CONFIG_MINI_FO=y

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

+CONFIG_MTD_BLKDEVS=y

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


@@ -225,8 +224,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_PCI is not set
 # CONFIG_MTD_ONENAND is not set
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_PCI is not set


@@ -242,7 +239,6 @@ CONFIG_MTD_REDBOOT_PARTS_READONLY=y
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_NATSEMI is not set
 # CONFIG_NE2K_PCI is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_NATSEMI is not set
 # CONFIG_NE2K_PCI is not set

-CONFIG_NETDEV_1000=y

 # CONFIG_NET_CLS_ACT is not set
 # CONFIG_NET_CLS_IND is not set
 CONFIG_NET_DMA=y
 # CONFIG_NET_CLS_ACT is not set
 # CONFIG_NET_CLS_IND is not set
 CONFIG_NET_DMA=y


@@ -257,57 +253,24 @@ CONFIG_NET_DMA=y
 # CONFIG_NLS_ISO8859_15 is not set
 # CONFIG_NLS_KOI8_R is not set
 # CONFIG_NO_IDLE_HZ is not set
 # CONFIG_NLS_ISO8859_15 is not set
 # CONFIG_NLS_KOI8_R 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_OABI_COMPAT is not set
 # CONFIG_NVRAM is not set
 # CONFIG_OABI_COMPAT is not set

-# CONFIG_PATA_ALI is not set
-# CONFIG_PATA_AMD is not set
-CONFIG_PATA_ARTOP=m
-# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_CMD64X is not set
-# CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
-# CONFIG_PATA_CYPRESS is not set
-# CONFIG_PATA_EFAR is not set
-# CONFIG_PATA_HPT366 is not set
-# CONFIG_PATA_HPT37X is not set
-# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_IT821X is not set
-# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NS87410 is not set
-# CONFIG_PATA_OLDPIIX is not set
-# CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_OPTIDMA is not set
-# CONFIG_PATA_PDC2027X is not set
-# CONFIG_PATA_PDC_OLD is not set
-# CONFIG_PATA_RADISYS is not set
-# CONFIG_PATA_RZ1000 is not set
-# CONFIG_PATA_SC1200 is not set
-# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_SIL680 is not set
-# CONFIG_PATA_SIS is not set
-# CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_VIA is not set
-# CONFIG_PATA_WINBOND is not set
+# CONFIG_OCF_OCF is not set
+# CONFIG_OUTER_CACHE is not set
+CONFIG_PAGEFLAGS_EXTENDED=y

 # CONFIG_PC300 is not set
 # CONFIG_PC300 is not set

-# CONFIG_PCCARD is not set
+CONFIG_PCI=y

 # CONFIG_PCI200SYN is not set
 # CONFIG_PCIPCWATCHDOG is not set
 # CONFIG_PCI200SYN is not set
 # CONFIG_PCIPCWATCHDOG is not set

-CONFIG_PCI=y
-# CONFIG_PDC_ADMA is not set
+CONFIG_PCI_SYSCALL=y

 CONFIG_PLAT_IOP=y
 CONFIG_PLAT_IOP=y

-# CONFIG_PM is not set

 # CONFIG_PPP is not set
 # CONFIG_PRISM54 is not set
 # CONFIG_PPP is not set
 # CONFIG_PRISM54 is not set

+# CONFIG_R6040 is not set

 CONFIG_R8169=y
 CONFIG_R8169_NAPI=y
 CONFIG_R8169_VLAN=y
 CONFIG_R8169=y
 CONFIG_R8169_NAPI=y
 CONFIG_R8169_VLAN=y

-# CONFIG_REISERFS_FS is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_RPCSEC_GSS_KRB5 is not set

 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_DEBUG is not set
 # CONFIG_RTC_DRV_DS1307 is not set
 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_DEBUG is not set
 # CONFIG_RTC_DRV_DS1307 is not set


@@ -334,85 +297,22 @@ CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_LIB=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_LIB=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y

-# CONFIG_SATA_AHCI is not set
-# CONFIG_SATA_MV is not set
-# CONFIG_SATA_NV is not set
-# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_QSTOR is not set
-# CONFIG_SATA_SIL is not set
-# CONFIG_SATA_SIL24 is not set
-# CONFIG_SATA_SIS is not set
-# CONFIG_SATA_SVW is not set
-# CONFIG_SATA_SX4 is not set
-# CONFIG_SATA_ULI is not set
-# CONFIG_SATA_VIA is not set
-# CONFIG_SATA_VITESSE is not set
-# CONFIG_SCSI_IPR is not set

 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SCSI_MULTI_LUN is not set

-# CONFIG_SENSORS_ABITUGURU is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1029 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ADT7470 is not set
-# CONFIG_SENSORS_ASB100 is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_DS1337 is not set
-# CONFIG_SENSORS_DS1374 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_EEPROM is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
-# CONFIG_SENSORS_F75375S is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCPOS is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_I5K_AMB is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
-# CONFIG_SENSORS_LM80 is not set
-# CONFIG_SENSORS_LM83 is not set
-# CONFIG_SENSORS_LM85 is not set
-# CONFIG_SENSORS_LM87 is not set
-# CONFIG_SENSORS_LM90 is not set
-# CONFIG_SENSORS_LM92 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_MAX6875 is not set
+CONFIG_SCSI_WAIT_SCAN=m

 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87360 is not set

-# CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_SIS5595 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_SMSC47M192 is not set
-# CONFIG_SENSORS_VIA686A is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_SENSORS_VT8231 is not set
-# CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83791D is not set
-# CONFIG_SENSORS_W83792D is not set
-# CONFIG_SENSORS_W83793 is not set
-# CONFIG_SENSORS_W83L785TS is not set

 # CONFIG_SERIAL_8250_EXTENDED is not set
 # CONFIG_SHMEM is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
 # CONFIG_SHMEM is not set

-# CONFIG_SMB_FS is not set
+CONFIG_SLABINFO=y

 # CONFIG_SMC91X is not set
 # CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_SOUND is not set
 # CONFIG_SPARSEMEM_STATIC is not set
 # CONFIG_SMC91X is not set
 # CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_SOUND is not set
 # CONFIG_SPARSEMEM_STATIC is not set

+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set

 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SPLIT_PTLOCK_CPUS=4096

+CONFIG_SSB_POSSIBLE=y

 # CONFIG_SWAP is not set
 # CONFIG_SWAP is not set

-CONFIG_SYN_COOKIES=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y

 # CONFIG_TCP_CONG_HSTCP is not set
 # CONFIG_TCP_CONG_HYBLA is not set
 # CONFIG_TCP_CONG_LP is not set
 # CONFIG_TCP_CONG_HSTCP is not set
 # CONFIG_TCP_CONG_HYBLA is not set
 # CONFIG_TCP_CONG_LP is not set


@@ -420,24 +320,21 @@ CONFIG_SYN_COOKIES=y
 CONFIG_TCP_CONG_VEGAS=m
 # CONFIG_TCP_CONG_VENO is not set
 CONFIG_TCP_CONG_WESTWOOD=y
 CONFIG_TCP_CONG_VEGAS=m
 # CONFIG_TCP_CONG_VENO is not set
 CONFIG_TCP_CONG_WESTWOOD=y

+# CONFIG_TICK_ONESHOT is not set

 CONFIG_TINY_SHMEM=y
 # CONFIG_TUN is not set
 CONFIG_UID16=y
 CONFIG_TINY_SHMEM=y
 # CONFIG_TUN is not set
 CONFIG_UID16=y

-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_USBPCWATCHDOG is not set

 CONFIG_USB=m
 # CONFIG_USB_ACM is not set
 CONFIG_USB=m
 # CONFIG_USB_ACM is not set

-CONFIG_USB_BANDWIDTH=y

 # CONFIG_USB_CATC is not set
 CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_CATC is not set
 CONFIG_USB_EHCI_HCD=m

-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-# CONFIG_USB_EHCI_SPLIT_ISO is not set
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+# CONFIG_USB_ISIGHTFW is not set

 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_KAWETH is not set

+# 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_OHCI_HCD=m
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_PRINTER is not set

-# CONFIG_USB_RTL8150 is not set

 # CONFIG_USB_SERIAL is not set
 # CONFIG_USB_STORAGE_ALAUDA is not set
 # CONFIG_USB_STORAGE_DATAFAB is not set
 # CONFIG_USB_SERIAL is not set
 # CONFIG_USB_STORAGE_ALAUDA is not set
 # CONFIG_USB_STORAGE_DATAFAB is not set


@@ -450,11 +347,14 @@ CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_STORAGE_USBAT is not set
 CONFIG_USB_UHCI_HCD=m
 # CONFIG_USB_USBNET is not set
 # CONFIG_USB_STORAGE_USBAT is not set
 CONFIG_USB_UHCI_HCD=m
 # CONFIG_USB_USBNET is not set

-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_ZD1201 is not set
-# CONFIG_USER_NS is not set

 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_VECTORS_BASE=0xffff0000

+# CONFIG_VGASTATE is not set

 # CONFIG_VIA_RHINE is not set
 # CONFIG_VIA_RHINE is not set

+CONFIG_VIDEO_ALLOW_V4L1=y
+CONFIG_VIDEO_MEDIA=m
+CONFIG_VIDEO_V4L1=m
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_V4L2_COMMON=m

 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_WAN=y
 # CONFIG_WANXL is not set
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_WAN=y
 # CONFIG_WANXL is not set