aboutsummaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <jacmet@sunsite.dk>2011-11-29 09:18:30 +0100
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2011-11-29 09:18:30 +0100
commit47c46ea1fc4a4c18be830f9092a8b9d8b3feda38 (patch)
treeadd055e730ccca749cc5b1721b5be957d3df3500 /linux
parenteffecb4a014d1809293b9b61f1cc2a61f2512e78 (diff)
downloadbuildroot-47c46ea1fc4a4c18be830f9092a8b9d8b3feda38.tar.gz
buildroot-47c46ea1fc4a4c18be830f9092a8b9d8b3feda38.tar.bz2
linux: update stable kernel to 3.1.4
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'linux')
-rw-r--r--linux/Config.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/Config.in b/linux/Config.in
index 2ceaef0dc7..dc6aa733a5 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
default BR2_LINUX_KERNEL_3_1
config BR2_LINUX_KERNEL_3_1
- bool "3.1.3"
+ bool "3.1.4"
config BR2_LINUX_KERNEL_SAME_AS_HEADERS
bool "Same as toolchain kernel headers"
@@ -58,7 +58,7 @@ endchoice
config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE
string "Kernel version"
depends on BR2_LINUX_KERNEL_CUSTOM_VERSION
- default "3.1.3"
+ default "3.1.4"
config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
string "URL of custom kernel tarball"
@@ -74,7 +74,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
config BR2_LINUX_KERNEL_VERSION
string
- default "3.1.3" if BR2_LINUX_KERNEL_3_1
+ default "3.1.4" if BR2_LINUX_KERNEL_3_1
default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL