summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-06-19 09:16:03 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-19 09:16:03 -0300
commit0e5e865d415e3e6de0eb7a4199b22f954e591ea4 (patch)
treebd309d3ee60bb8619cab9c5ab2cd8bd2d208101c
parent7bb0a55b44520917491be5fdcc14fb47369062dd (diff)
downloadmediapointer-dvb-s2-0e5e865d415e3e6de0eb7a4199b22f954e591ea4.tar.gz
mediapointer-dvb-s2-0e5e865d415e3e6de0eb7a4199b22f954e591ea4.tar.bz2
hex defaults in Kconfig sometimes have "0x", sometimes don't
From: Trent Piepho <xyzzy@speakeasy.org> A check of the current Linux 2.6 kernel reveals that the default values for hex options sometimes have the form "0x1f0" and sometimes "1f0", with the former being more common. Adjust the make_kconfig.pl script so it can understand both. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rwxr-xr-xv4l/scripts/make_kconfig.pl4
1 files changed, 2 insertions, 2 deletions
diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl
index 4511f0def..b499fefa1 100755
--- a/v4l/scripts/make_kconfig.pl
+++ b/v4l/scripts/make_kconfig.pl
@@ -146,8 +146,8 @@ sub open_kconfig($$) {
set_int_value($key, $1);
}
# Get default for hex options
- if (m|^\s+default "([[:xdigit:]]+)"| && exists $hexopt{$key}) {
- set_hex_value($key, $1);
+ if (m|^\s+default "(0x)?([[:xdigit:]]+)"| && exists $hexopt{$key}) {
+ set_hex_value($key, $2);
}
# Override default for disabled tri/bool options
if (m/^\s+default (y|n|m|"yes"|"no")\s+(if .*)?$/ &&