diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch index 3003ced0e..3289de38f 100755 --- a/scripts/generate-kernel-patch +++ b/scripts/generate-kernel-patch @@ -214,6 +214,17 @@ else kernel_version="$1" fi +# Hack: make sure that for kernel 2.6.33 and later the line +# "#define CONFIG_SCST_PROC" is removed from scst/include/scst.h. +# This is done because of the following change in r1609: +# Index: scst/kernel/in-tree/Makefile.scst-2.6.33 +# =================================================================== +# -scst-y += scst_proc.o +# +scst-y += scst_sysfs.o +if [ ! "${kernel_version}" "<" "2.6.33" ]; then + specialize_patch_options="${specialize_patch_options} -v config_scst_proc_undefined=1" +fi + if [ "${multiple_patches}" = "false" ]; then echo "Signed-off-by: ${SIGNED_OFF_BY}" echo ""