summaryrefslogtreecommitdiffstats
path: root/target/linux/x86/Makefile
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-11-03 01:02:39 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-11-03 01:02:39 +0000
commitea8823c99319e5c11b975d14c95b487d25ec0f3f (patch)
tree03f9a68e47a3153852d46b0dcbcea4d9651691dd /target/linux/x86/Makefile
parentf6a11cc55378ee1eb4d7566fb376d31a5bfca933 (diff)
[x86] merge the olpc target with the x86 target, both tested and running
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18279 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 899939581..d7c562522 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