Merge from master

From: Hans Verkuil <hverkuil@xs4all.nl>



Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

1 files changed, 9 insertions, 5 deletions

diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl
index d558aaeb6..7cb258d86 100755
--- a/v4l/scripts/make_kconfig.pl
+++ b/v4l/scripts/make_kconfig.pl
@@ -475,6 +475,10 @@ sub cmp_ver($$)
 	return $v1_sublevel <=> $v2_sublevel;
 }
 
+# Get kernel version
+get_version();
+print "Preparing to compile for kernel version $kernver\n";
+
 # Get Kernel's config settings
 %kernopts = process_config("$kernel/.config");
 
@@ -492,14 +496,14 @@ EOF
 	exit -1;
 }
 
+# Kernel < 2.6.22 is missing the HAS_IOMEM option
+if (!defined $kernopts{HAS_IOMEM} && cmp_ver($kernver, '2.6.22') < 0) {
+    $kernopts{HAS_IOMEM} = 2;
+}
+
 # Get minimum kernel version for our variables
 parse_versions();
 
-# Get kernel version
-get_version();
-
-print "Preparing to compile for kernel version $kernver\n";
-
 kernelcheck();
 
 open OUT, ">Kconfig" or die "Cannot write Kconfig file";