summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Neumann <s.neumann@raumfeld.com>2011-12-09 21:43:15 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2011-12-11 21:23:46 (GMT)
commitd170a72498c32302d49320004b1706e327104198 (patch)
tree9db6360f06f28a874dea61f4a63ceeb45dd0263d
parent267e1672166741ec1d5049061cc010294545e512 (diff)
downloadbuildroot-d170a72498c32302d49320004b1706e327104198.tar.gz
buildroot-d170a72498c32302d49320004b1706e327104198.tar.bz2
linux: update stable kernel to 3.1.5
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--linux/Config.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/Config.in b/linux/Config.in
index dc6aa73..3022b91 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.4"
+ bool "3.1.5"
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.4"
+ default "3.1.5"
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.4" if BR2_LINUX_KERNEL_3_1
+ default "3.1.5" 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