From 1f8e50c93268abe4277a1391546651ecd0cf3bcf Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 3 Nov 2009 01:02:39 +0000
Subject: [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
---
 target/linux/x86/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'target/linux/x86/Makefile')

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
 
-- 
cgit v1.2.3