[8.09] x86: merge r13158

[openwrt/svn-archive/archive.git] / target / linux / x86 / Makefile

diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile
index ab23e9f7958a7dbcee7dfed4345944a22215b4a1..85d70484f1107db5c4337d5ddd68ec6e1500c125 100644 (file)
--- a/target/linux/x86/Makefile
+++ b/target/linux/x86/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
 ARCH=i386
 BOARD:=x86
 BOARDNAME:=x86
-FEATURES:=squashfs jffs2 ext2
-SUBTARGETS=generic mediacenter
+FEATURES:=squashfs jffs2 ext2 vdi vmdk
+SUBTARGETS=generic
 
-LINUX_VERSION:=2.6.23.1
+LINUX_VERSION:=2.6.25.20
 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += kmod-natsemi kmod-ne2k-pci