summaryrefslogtreecommitdiff
path: root/kconfig
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2012-12-21 21:25:30 +0100
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2012-12-21 21:25:30 +0100
commit1936a28f8a73420e0e2a0a7ca4427ed9732ec953 (patch)
tree3c53ab90d86deda5fce61b8407ba8d8b06001541 /kconfig
parent33b496d3514be17ad8fc296e0383b68f205b4553 (diff)
parent830d3caa84325a03afdf5a52f0fbb08347460fb6 (diff)
downloadembtoolkit-1936a28f8a73420e0e2a0a7ca4427ed9732ec953.tar.gz
embtoolkit-1936a28f8a73420e0e2a0a7ca4427ed9732ec953.tar.bz2
embtoolkit-1936a28f8a73420e0e2a0a7ca4427ed9732ec953.tar.xz
Merge branch 'master' into llvm-support
Diffstat (limited to 'kconfig')
-rw-r--r--kconfig/linux-kconfigs/linux-3.0.kconfig6
-rw-r--r--kconfig/linux-kconfigs/linux-3.2.kconfig6
-rw-r--r--kconfig/linux-kconfigs/linux-3.4.kconfig6
-rw-r--r--kconfig/linux-kconfigs/linux-3.6.kconfig4
4 files changed, 11 insertions, 11 deletions
diff --git a/kconfig/linux-kconfigs/linux-3.0.kconfig b/kconfig/linux-kconfigs/linux-3.0.kconfig
index a812af4..253550e 100644
--- a/kconfig/linux-kconfigs/linux-3.0.kconfig
+++ b/kconfig/linux-kconfigs/linux-3.0.kconfig
@@ -28,13 +28,13 @@ choice
help
Linux v3.0.x series exact version used.
- config EMBTK_LINUX_VERSION_3_0_48
- bool "linux-3.0.48"
+ config EMBTK_LINUX_VERSION_3_0_57
+ bool "linux-3.0.57"
endchoice
config EMBTK_LINUX_VERSION_STRING
string
- default "3.0.48"
+ default "3.0.57"
config EMBTK_LINUX_MAJOR_VERSION_STRING
string
diff --git a/kconfig/linux-kconfigs/linux-3.2.kconfig b/kconfig/linux-kconfigs/linux-3.2.kconfig
index caf2314..48d5999 100644
--- a/kconfig/linux-kconfigs/linux-3.2.kconfig
+++ b/kconfig/linux-kconfigs/linux-3.2.kconfig
@@ -28,13 +28,13 @@ choice
help
Linux v3.2.x series exact version used.
- config EMBTK_LINUX_VERSION_3_2_32
- bool "linux-3.2.32"
+ config EMBTK_LINUX_VERSION_3_2_35
+ bool "linux-3.2.35"
endchoice
config EMBTK_LINUX_VERSION_STRING
string
- default "3.2.32"
+ default "3.2.35"
config EMBTK_LINUX_MAJOR_VERSION_STRING
string
diff --git a/kconfig/linux-kconfigs/linux-3.4.kconfig b/kconfig/linux-kconfigs/linux-3.4.kconfig
index 428e0d1..d8dab89 100644
--- a/kconfig/linux-kconfigs/linux-3.4.kconfig
+++ b/kconfig/linux-kconfigs/linux-3.4.kconfig
@@ -28,13 +28,13 @@ choice
help
Linux v3.4.x series exact version used.
- config EMBTK_LINUX_VERSION_3_4_15
- bool "linux-3.4.15"
+ config EMBTK_LINUX_VERSION_3_4_24
+ bool "linux-3.4.24"
endchoice
config EMBTK_LINUX_VERSION_STRING
string
- default "3.4.15"
+ default "3.4.24"
config EMBTK_LINUX_MAJOR_VERSION_STRING
string
diff --git a/kconfig/linux-kconfigs/linux-3.6.kconfig b/kconfig/linux-kconfigs/linux-3.6.kconfig
index a141d26..a39e6a2 100644
--- a/kconfig/linux-kconfigs/linux-3.6.kconfig
+++ b/kconfig/linux-kconfigs/linux-3.6.kconfig
@@ -28,13 +28,13 @@ choice
help
Linux v3.6.x series exact version used.
- config EMBTK_LINUX_VERSION_3_6_3
+ config EMBTK_LINUX_VERSION_3_6_11
bool "linux-3.6.3"
endchoice
config EMBTK_LINUX_VERSION_STRING
string
- default "3.6.3"
+ default "3.6.11"
config EMBTK_LINUX_MAJOR_VERSION_STRING
string