summaryrefslogtreecommitdiffstats
path: root/target/linux/octeon
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-07-05 14:39:13 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-07-05 14:39:13 +0000
commitf1d5ca45b61ea84f3f057393fe7d7162b2aa4853 (patch)
treea50abe383d320a28a34e3d5def552f0d423bc638 /target/linux/octeon
parent74cd05d02c09a9523c5f04979fcf6d8241174b18 (diff)
[kernel] update targets to 2.6.30.1, update patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16697 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/octeon')
-rw-r--r--target/linux/octeon/Makefile2
-rw-r--r--target/linux/octeon/patches/105-nb5_fixup.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/octeon/Makefile b/target/linux/octeon/Makefile
index 96a322667..4c43148e6 100644
--- a/target/linux/octeon/Makefile
+++ b/target/linux/octeon/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=Cavium Networks Octeon
FEATURES:=squashfs jffs2 pci
CFLAGS:=-Os -pipe -funit-at-a-time
-LINUX_VERSION:=2.6.30
+LINUX_VERSION:=2.6.30.1
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/octeon/patches/105-nb5_fixup.patch b/target/linux/octeon/patches/105-nb5_fixup.patch
index c28adf32f..2165eb0a1 100644
--- a/target/linux/octeon/patches/105-nb5_fixup.patch
+++ b/target/linux/octeon/patches/105-nb5_fixup.patch
@@ -9,7 +9,7 @@
default:
return "";
}
---- a/drviers/staging/octeon/cvmx-helper-board.c
+--- a/drivers/staging/octeon/cvmx-helper-board.c
+++ b/drivers/staging/octeon/cvmx-helper-board.c
@@ -699,6 +699,7 @@ cvmx_helper_board_usb_clock_types_t __cv
{