[adm5120] do not overrid CONFIG_BRIDGE (#5163)

[openwrt.git] / target / linux / x86 / Makefile

diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile
index 0e79331..2a82cec 100644 (file)
--- a/target/linux/x86/Makefile
+++ b/target/linux/x86/Makefile
@@ -9,11 +9,10 @@ include $(TOPDIR)/rules.mk
 ARCH=i386
 BOARD:=x86
 BOARDNAME:=x86
 ARCH=i386
 BOARD:=x86
 BOARDNAME:=x86

-FEATURES:=squashfs jffs2 ext2 vdi vmdk
+FEATURES:=squashfs jffs2 ext2 vdi vmdk pcmcia tgz

 SUBTARGETS=generic
 
 SUBTARGETS=generic
 

-LINUX_VERSION:=2.6.28.6
-LINUX_KARCH:=x86
+LINUX_VERSION:=2.6.28.10

 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += kmod-natsemi kmod-ne2k-pci
 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += kmod-natsemi kmod-ne2k-pci