diff options
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/Config.in | 4 | ||||
| -rw-r--r-- | linux/linux-ext-ocf-linux.mk | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/linux/Config.in b/linux/Config.in index 29a21109e..f408ad55c 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -21,7 +21,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_3_6 - bool "3.6.6" + bool "3.6.8" config BR2_LINUX_KERNEL_SAME_AS_HEADERS bool "Same as toolchain kernel headers" @@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION config BR2_LINUX_KERNEL_VERSION string - default "3.6.6" if BR2_LINUX_KERNEL_3_6 + default "3.6.8" if BR2_LINUX_KERNEL_3_6 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 diff --git a/linux/linux-ext-ocf-linux.mk b/linux/linux-ext-ocf-linux.mk index faf7360e4..1a601d58c 100644 --- a/linux/linux-ext-ocf-linux.mk +++ b/linux/linux-ext-ocf-linux.mk @@ -15,6 +15,8 @@ LINUX_DEPENDENCIES += ocf-linux define OCF_LINUX_PREPARE_KERNEL support/scripts/apply-patches.sh $(LINUX_DIR) \ $(OCF_LINUX_DIR)/patches/ linux-3.2.1-ocf.patch ; \ + grep -q __mix_pool_bytes $(LINUX_DIR)/drivers/char/random.c && \ + $(SED) 's:wordcount\*4:&, NULL:' $(LINUX_DIR)/drivers/char/random.c ; \ cp -rf $(OCF_LINUX_DIR)/ocf $(LINUX_DIR)/crypto/ocf ; endef |