[backfire] merge [21237:21239] & [21244]

[openwrt-10.03/.git] / target / linux / kirkwood / Makefile

diff --git a/target/linux/kirkwood/Makefile b/target/linux/kirkwood/Makefile
index 861d3be876c029f036e0cec311933073c279bfd6..13f38af45223c5aab82bc71066c02b3522a27b25 100644 (file)
--- a/target/linux/kirkwood/Makefile
+++ b/target/linux/kirkwood/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 ARCH:=arm
 BOARD:=kirkwood
 BOARDNAME:=Marvell Kirkwood
-FEATURES:=jffs2 usb broken
+FEATURES:=targz usb
 
-LINUX_VERSION:=2.6.30-rc5
+LINUX_VERSION:=2.6.30.10
 
 include $(INCLUDE_DIR)/target.mk