[adm5120] do not overrid CONFIG_BRIDGE (#5163)

[openwrt.git] / target / linux / cavium-octeon / Makefile

diff --git a/target/linux/cavium-octeon/Makefile b/target/linux/cavium-octeon/Makefile
index 1d5df00..1cb2c09 100644 (file)
--- a/target/linux/cavium-octeon/Makefile
+++ b/target/linux/cavium-octeon/Makefile
@@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
 ARCH:=mips
 BOARD:=cavium-octeon
 BOARDNAME:=Cavium Networks Octeon
-FEATURES:=squashfs jffs2
+FEATURES:=squashfs jffs2 pci
 CFLAGS:=-Os -pipe -funit-at-a-time
 
-LINUX_VERSION:=2.6.29.2
+LINUX_VERSION:=2.6.30-rc6
 
 include $(INCLUDE_DIR)/target.mk