aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86/Makefile
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-11-03 01:02:39 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-11-03 01:02:39 +0000
commite49c2d769162c261a035db1a979f639b20effd47 (patch)
tree4286407f29abcbd533e439ccccd20e8d4a184cb5 /target/linux/x86/Makefile
parenta4db9ed4529ba632d80f4d55eafc89c9c23851d2 (diff)
downloadupstream-e49c2d769162c261a035db1a979f639b20effd47.tar.gz
upstream-e49c2d769162c261a035db1a979f639b20effd47.tar.bz2
upstream-e49c2d769162c261a035db1a979f639b20effd47.zip
merge the olpc target with the x86 target, both tested and running
SVN-Revision: 18279
Diffstat (limited to 'target/linux/x86/Makefile')
-rw-r--r--target/linux/x86/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile
index 8999395818..d7c5625227 100644
--- a/target/linux/x86/Makefile
+++ b/target/linux/x86/Makefile
@@ -10,9 +10,9 @@ ARCH=i386
BOARD:=x86
BOARDNAME:=x86
FEATURES:=squashfs jffs2 ext2 vdi vmdk pcmcia tgz
-SUBTARGETS=generic
+SUBTARGETS=generic olpc
-LINUX_VERSION:=2.6.31.5
+LINUX_VERSION:=2.6.30.9
include $(INCLUDE_DIR)/target.mk