summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--target/linux/generic-2.6/config-template5
-rw-r--r--target/linux/x86-2.6/config/default18
2 files changed, 4 insertions, 19 deletions
diff --git a/target/linux/generic-2.6/config-template b/target/linux/generic-2.6/config-template
index c505a21c8..60f5bae06 100644
--- a/target/linux/generic-2.6/config-template
+++ b/target/linux/generic-2.6/config-template
@@ -47,6 +47,7 @@ CONFIG_ATM_TCP=m
# CONFIG_AUTOFS_FS is not set
CONFIG_AX25=m
# CONFIG_AX25_DAMA_SLAVE is not set
+# CONFIG_B44 is not set
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
CONFIG_BASE_FULL=y
# CONFIG_BASLER_EXCITE is not set
@@ -325,6 +326,8 @@ CONFIG_HAMRADIO=y
CONFIG_HERMES=m
CONFIG_HFSPLUS_FS=m
CONFIG_HFS_FS=m
+# CONFIG_HID_DEBUG is not set
+# CONFIG_HID_FF is not set
# CONFIG_HIPPI is not set
CONFIG_HOSTAP=m
CONFIG_HOSTAP_CS=m
@@ -1473,7 +1476,7 @@ CONFIG_USB_USBNET_MII=m
# CONFIG_USB_WACOM is not set
# CONFIG_USB_XPAD is not set
# CONFIG_USB_XUSBATM is not set
-CONFIG_USB_YEALINK=m
+CONFIG_USB_YEALINK=m
CONFIG_USB_ZD1201=m
# CONFIG_UTS_NS is not set
CONFIG_VFAT_FS=m
diff --git a/target/linux/x86-2.6/config/default b/target/linux/x86-2.6/config/default
index 242e90e2c..fbddfea51 100644
--- a/target/linux/x86-2.6/config/default
+++ b/target/linux/x86-2.6/config/default
@@ -25,7 +25,6 @@ CONFIG_ATA=m
# CONFIG_ATA_GENERIC is not set
# CONFIG_ATA_NONSTANDARD is not set
CONFIG_ATA_PIIX=m
-# CONFIG_B44 is not set
CONFIG_BASE_SMALL=0
# CONFIG_BINFMT_AOUT is not set
CONFIG_BITREVERSE=y
@@ -100,7 +99,6 @@ CONFIG_GENERIC_ISA_DMA=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HID=y
-# CONFIG_HID_DEBUG is not set
# CONFIG_HIGHMEM4G is not set
# CONFIG_HIGHMEM64G is not set
# CONFIG_HIGH_RES_TIMERS is not set
@@ -116,9 +114,6 @@ CONFIG_HW_RANDOM=y
CONFIG_HW_RANDOM_GEODE=y
# CONFIG_HW_RANDOM_INTEL is not set
CONFIG_HW_RANDOM_VIA=y
-CONFIG_HZ=100
-CONFIG_HZ_100=y
-# CONFIG_HZ_250 is not set
CONFIG_I2C=m
CONFIG_I2C_ALGOBIT=m
CONFIG_I2C_CHARDEV=m
@@ -249,17 +244,6 @@ CONFIG_NET_SCH_FIFO=y
CONFIG_NET_VENDOR_3COM=y
# CONFIG_NET_VENDOR_RACAL is not set
# CONFIG_NET_VENDOR_SMC is not set
-CONFIG_NF_CONNTRACK=y
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CT_ACCT=y
-# CONFIG_NF_NAT_AMANDA is not set
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_NEEDED=y
-# CONFIG_NF_NAT_PPTP is not set
-CONFIG_NF_NAT_SIP=m
-# CONFIG_NF_NAT_TFTP is not set
CONFIG_NOHIGHMEM=y
# CONFIG_NO_HZ is not set
CONFIG_NSC_GPIO=m
@@ -409,5 +393,3 @@ CONFIG_X86_PPRO_FENCE=y
# CONFIG_X86_VISWS is not set
# CONFIG_X86_VOYAGER is not set
CONFIG_X86_WP_WORKS_OK=y
-CONFIG_ZONE_DMA=y
-CONFIG_ZONE_DMA_FLAG=1