From: Imre Kaloz Date: Thu, 26 Jun 2008 13:51:17 +0000 (+0000) Subject: move some config options into the generic one X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=cef5e994b3ffb131ecf9b7f522218a625d49541e;p=openwrt%2Fstaging%2Fnbd.git move some config options into the generic one SVN-Revision: 11581 --- diff --git a/target/linux/generic-2.6/config-2.6.26 b/target/linux/generic-2.6/config-2.6.26 index 4a335278bd..8d834fcabd 100644 --- 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 @@ -1495,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 @@ -1627,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 diff --git a/target/linux/orion/config-default b/target/linux/orion/config-default index 079963584d..9e2cb1417b 100644 --- a/target/linux/orion/config-default +++ b/target/linux/orion/config-default @@ -85,14 +85,12 @@ CONFIG_CRC16=y # CONFIG_CRC_CCITT is not set CONFIG_CRYPTO_AEAD=m CONFIG_CRYPTO_AUTHENC=m -# CONFIG_CRYPTO_CTS is not set 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_DEVKMEM is not set CONFIG_DEVPORT=y CONFIG_DLCI=m CONFIG_DLCI_MAX=8 @@ -105,7 +103,6 @@ CONFIG_DNOTIFY=y # CONFIG_FPE_FASTFPE is not set # CONFIG_FPE_NWFPE is not set CONFIG_FRAME_POINTER=y -CONFIG_FRAME_WARN=1024 CONFIG_FS_POSIX_ACL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -130,7 +127,6 @@ CONFIG_HDLC_PPP=m CONFIG_HDLC_RAW=m # CONFIG_HDLC_RAW_ETH is not set # CONFIG_HERMES is not set -# CONFIG_HTC_PASIC3 is not set CONFIG_HWMON=y # CONFIG_HWMON_DEBUG_CHIP is not set CONFIG_HW_RANDOM=y @@ -138,7 +134,6 @@ CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_MV64XXX=y -# CONFIG_I2C_PCA_PLATFORM 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 @@ -203,11 +198,9 @@ CONFIG_MEDIA_TUNER_TEA5767=m CONFIG_MEDIA_TUNER_XC2028=m CONFIG_MEDIA_TUNER_XC5000=m # CONFIG_MINIX_FS is not set -# CONFIG_MODULE_FORCE_LOAD is not set CONFIG_MTD=y # CONFIG_MTD_ABSENT is not set # CONFIG_MTD_AFS_PARTS is not set -# CONFIG_MTD_AR7_PARTS is not set # CONFIG_MTD_ARM_INTEGRATOR is not set CONFIG_MTD_BLKDEVS=y CONFIG_MTD_BLOCK=y @@ -265,7 +258,6 @@ CONFIG_MV643XX_ETH=y # CONFIG_NET_SCH_NETEM is not set # CONFIG_NET_VENDOR_3COM is not set # CONFIG_NEW_LEDS is not set -# CONFIG_NF_CT_PROTO_DCCP is not set # CONFIG_NLS_CODEPAGE_437 is not set # CONFIG_NLS_CODEPAGE_850 is not set # CONFIG_NLS_ISO8859_1 is not set @@ -328,7 +320,6 @@ CONFIG_SLABINFO=y CONFIG_SPLIT_PTLOCK_CPUS=4096 CONFIG_SSB_POSSIBLE=y # CONFIG_SWAP is not set -CONFIG_SYSCTL_SYSCALL_CHECK=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y # CONFIG_TCP_CONG_HSTCP is not set @@ -354,8 +345,6 @@ CONFIG_USB_EHCI_HCD=m # 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_OTG_BLACKLIST_HUB is not set -# CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_PEGASUS is not set # CONFIG_USB_PRINTER is not set # CONFIG_USB_R8A66597_HCD is not set