move some config options into the generic one

[openwrt.git] / target / linux / generic-2.6 / config-2.6.26

diff --git a/target/linux/generic-2.6/config-2.6.26 b/target/linux/generic-2.6/config-2.6.26
index 5f3bc76..8d834fc 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.26
+++ b/target/linux/generic-2.6/config-2.6.26
@@ -251,6 +251,7 @@ CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_CRC32C=m
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_CTR=m
+# CONFIG_CRYPTO_CTS is not set
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_ECB=m
@@ -305,6 +306,7 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 # CONFIG_DEVFS_DEBUG is not set
 CONFIG_DEVFS_FS=y
 CONFIG_DEVFS_MOUNT=y
+# CONFIG_DEVKMEM is not set
 # CONFIG_DGRS is not set
 # CONFIG_DISCONTIGMEM_MANUAL is not set
 # CONFIG_DISPLAY_SUPPORT is not set
@@ -357,6 +359,7 @@ CONFIG_FLATMEM=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_FORCEDETH is not set
+CONFIG_FRAME_WARN=1024
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_FTL is not set
 # CONFIG_FUSE_FS is not set
@@ -400,6 +403,7 @@ CONFIG_HOTPLUG=y
 # CONFIG_HOTPLUG_PCI is not set
 # CONFIG_HP100 is not set
 # CONFIG_HPFS_FS is not set
+# CONFIG_HTC_PASIC3 is not set
 # CONFIG_HUGETLB_PAGE is not set
 # CONFIG_HWMON is not set
 # CONFIG_HWMON_VID is not set
@@ -434,6 +438,7 @@ CONFIG_HZ_100=y
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_PCA_ISA is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
 # CONFIG_I2C_PIIX4 is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
@@ -751,6 +756,7 @@ CONFIG_MKISS=m
 # CONFIG_MMC_ARMMMCI is not set
 CONFIG_MMU=y
 CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_MODULE_UNLOAD=y
@@ -761,6 +767,7 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MOUSE_PC110PAD is not set
 CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
+# CONFIG_MTD_AR7_PARTS is not set
 # CONFIG_MTD_DATAFLASH is not set
 # CONFIG_MTD_M25P80 is not set
 # CONFIG_MTD_INTEL_VR_NOR is not set
@@ -909,6 +916,7 @@ CONFIG_NET_WIRELESS_RTNETLINK=y
 # CONFIG_NEW_GPIO is not set
 CONFIG_NEW_LEDS=y
 # CONFIG_NF_CT_NETLINK is not set
+# CONFIG_NF_CT_PROTO_DCCP is not set
 CONFIG_NFSD=m
 CONFIG_NFSD_TCP=y
 # CONFIG_NFSD_V2_ACL is not set
@@ -1153,6 +1161,7 @@ CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RTC_CLASS is not set
 CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_FM3130 is not set
 # CONFIG_RTC_DRV_MAX6900 is not set
 # CONFIG_RTC_DRV_MAX6902 is not set
 # CONFIG_RTC_DRV_R9701 is not set
@@ -1494,6 +1503,7 @@ CONFIG_SWAP=y
 CONFIG_SYN_COOKIES=y
 CONFIG_SYSCTL=y
 CONFIG_SYSCTL_SYSCALL=y
+CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_SYSFS=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
@@ -1626,6 +1636,8 @@ CONFIG_USB_NET_ZAURUS=m
 # CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OV511 is not set
 CONFIG_USB_PEGASUS=m
 # CONFIG_USB_PHIDGET is not set