X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=target%2Flinux%2Fgeneric%2Fconfig-2.6.34;h=cec70962b8d12cc531e4405d6ed7a3168c3412dc;hp=c396edf518f56ff1da18e4585de1cb67a607727c;hb=501cad2ce2368324a65f9bd94ae17bc900543f71;hpb=893b6dec9649c6997220a6ad0cc54b292256edc8

diff --git a/target/linux/generic/config-2.6.34 b/target/linux/generic/config-2.6.34
index c396edf518..cec70962b8 100644
--- a/target/linux/generic/config-2.6.34
+++ b/target/linux/generic/config-2.6.34
@@ -444,8 +444,8 @@ CONFIG_CRYPTO_UNLZMA=y
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ZLIB=y
 # CONFIG_CRYSTALHD is not set
-# CONFIG_CS5535_MFGPT is not set
 # CONFIG_CUSE is not set
+# CONFIG_CS5535_MFGPT is not set
 # CONFIG_DAB is not set
 # CONFIG_DAVICOM_PHY is not set
 # CONFIG_DCB is not set
@@ -2884,6 +2884,7 @@ CONFIG_VLAN_8021Q=y
 # CONFIG_VMSPLIT_3G_OPT is not set
 CONFIG_VMSPLIT_3G=y
 # CONFIG_VMXNET3 is not set
+# CONFIG_VMWARE_BALLOON is not set
 # CONFIG_VT6655 is not set
 # CONFIG_VT6656 is not set
 # CONFIG_VT is not set