From 7ef57f0f9ed2580012f83799151072efc6ce87f7 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Thu, 16 Sep 2010 10:56:37 +0000
Subject: [PATCH] Bug fix: made sure that the patch generated by command-line
 option -u actually compiles.

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2132 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scripts/generate-kernel-patch | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch
index 5e4308b9b..38b5cf207 100755
--- a/scripts/generate-kernel-patch
+++ b/scripts/generate-kernel-patch
@@ -309,6 +309,11 @@ add_file "${tmp_Kconfig}" "drivers/scst/Kconfig"
 
 tmp_Makefile="${tmpdir}/Makefile.scst-${kernel_version}"
 cat "scst/kernel/in-tree/Makefile.scst-${kernel_version}" | \
+if [ "${generating_upstream_patch}" = "true" ]; then
+  grep -v 'scst_proc'
+else
+  cat
+fi | \
 if [ -e "${fcst_patch_series}" ]; then
   cat
 else