[x86] merge the olpc target with the x86 target, both tested and running

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

diff --git a/target/linux/ppc40x/Makefile b/target/linux/ppc40x/Makefile
index 256f6cf..94c2a3b 100644 (file)
--- a/target/linux/ppc40x/Makefile
+++ b/target/linux/ppc40x/Makefile
@@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
 ARCH:=powerpc
 BOARD:=ppc40x
 BOARDNAME:=AMCC/IBM PPC40x
-FEATURES:=squashfs usb
+FEATURES:=squashfs
 CFLAGS:=-Os -pipe -funit-at-a-time -mcpu=405
 
-LINUX_VERSION:=2.6.30.8
+LINUX_VERSION:=2.6.30.9
 LINUX_KARCH:=powerpc
 
 include $(INCLUDE_DIR)/target.mk