diff options
-rw-r--r-- | Documentation/smart-config.txt | 4 | ||||
-rw-r--r-- | drivers/video/matrox/matroxfb_DAC1064.c | 1 | ||||
-rw-r--r-- | drivers/video/matrox/matroxfb_DAC1064.h | 1 | ||||
-rw-r--r-- | drivers/video/matrox/matroxfb_Ti3026.c | 1 | ||||
-rw-r--r-- | drivers/video/matrox/matroxfb_Ti3026.h | 1 | ||||
-rw-r--r-- | drivers/video/matrox/matroxfb_base.c | 1 | ||||
-rw-r--r-- | drivers/video/matrox/matroxfb_misc.c | 1 | ||||
-rwxr-xr-x | scripts/checkconfig.pl | 65 |
8 files changed, 0 insertions, 75 deletions
diff --git a/Documentation/smart-config.txt b/Documentation/smart-config.txt index c9bed4cf8773..8467447b5a87 100644 --- a/Documentation/smart-config.txt +++ b/Documentation/smart-config.txt | |||
@@ -56,10 +56,6 @@ Here is the solution: | |||
56 | writing one file per option. It updates only the files for options | 56 | writing one file per option. It updates only the files for options |
57 | that have changed. | 57 | that have changed. |
58 | 58 | ||
59 | mkdep.c no longer generates warning messages for missing or unneeded | ||
60 | <linux/config.h> lines. The new top-level target 'make checkconfig' | ||
61 | checks for these problems. | ||
62 | |||
63 | Flag Dependencies | 59 | Flag Dependencies |
64 | 60 | ||
65 | Martin Von Loewis contributed another feature to this patch: | 61 | Martin Von Loewis contributed another feature to this patch: |
diff --git a/drivers/video/matrox/matroxfb_DAC1064.c b/drivers/video/matrox/matroxfb_DAC1064.c index 0fbd9b5149f1..a456e67a5b00 100644 --- a/drivers/video/matrox/matroxfb_DAC1064.c +++ b/drivers/video/matrox/matroxfb_DAC1064.c | |||
@@ -12,7 +12,6 @@ | |||
12 | * | 12 | * |
13 | */ | 13 | */ |
14 | 14 | ||
15 | /* make checkconfig does not walk through include tree :-( */ | ||
16 | #include <linux/config.h> | 15 | #include <linux/config.h> |
17 | 16 | ||
18 | #include "matroxfb_DAC1064.h" | 17 | #include "matroxfb_DAC1064.h" |
diff --git a/drivers/video/matrox/matroxfb_DAC1064.h b/drivers/video/matrox/matroxfb_DAC1064.h index a6a470127289..2e7238aa2432 100644 --- a/drivers/video/matrox/matroxfb_DAC1064.h +++ b/drivers/video/matrox/matroxfb_DAC1064.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef __MATROXFB_DAC1064_H__ | 1 | #ifndef __MATROXFB_DAC1064_H__ |
2 | #define __MATROXFB_DAC1064_H__ | 2 | #define __MATROXFB_DAC1064_H__ |
3 | 3 | ||
4 | /* make checkconfig does not walk through include tree */ | ||
5 | #include <linux/config.h> | 4 | #include <linux/config.h> |
6 | 5 | ||
7 | #include "matroxfb_base.h" | 6 | #include "matroxfb_base.h" |
diff --git a/drivers/video/matrox/matroxfb_Ti3026.c b/drivers/video/matrox/matroxfb_Ti3026.c index 537ade5d8b21..23ebad0a12d8 100644 --- a/drivers/video/matrox/matroxfb_Ti3026.c +++ b/drivers/video/matrox/matroxfb_Ti3026.c | |||
@@ -78,7 +78,6 @@ | |||
78 | * | 78 | * |
79 | */ | 79 | */ |
80 | 80 | ||
81 | /* make checkconfig does not verify included files... */ | ||
82 | #include <linux/config.h> | 81 | #include <linux/config.h> |
83 | 82 | ||
84 | #include "matroxfb_Ti3026.h" | 83 | #include "matroxfb_Ti3026.h" |
diff --git a/drivers/video/matrox/matroxfb_Ti3026.h b/drivers/video/matrox/matroxfb_Ti3026.h index 541933d7e4ea..536e5f69de9f 100644 --- a/drivers/video/matrox/matroxfb_Ti3026.h +++ b/drivers/video/matrox/matroxfb_Ti3026.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef __MATROXFB_TI3026_H__ | 1 | #ifndef __MATROXFB_TI3026_H__ |
2 | #define __MATROXFB_TI3026_H__ | 2 | #define __MATROXFB_TI3026_H__ |
3 | 3 | ||
4 | /* make checkconfig does not walk through whole include tree */ | ||
5 | #include <linux/config.h> | 4 | #include <linux/config.h> |
6 | 5 | ||
7 | #include "matroxfb_base.h" | 6 | #include "matroxfb_base.h" |
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c index 4055ff6f5a81..951c9974a1d3 100644 --- a/drivers/video/matrox/matroxfb_base.c +++ b/drivers/video/matrox/matroxfb_base.c | |||
@@ -99,7 +99,6 @@ | |||
99 | * | 99 | * |
100 | */ | 100 | */ |
101 | 101 | ||
102 | /* make checkconfig does not check included files... */ | ||
103 | #include <linux/config.h> | 102 | #include <linux/config.h> |
104 | #include <linux/version.h> | 103 | #include <linux/version.h> |
105 | 104 | ||
diff --git a/drivers/video/matrox/matroxfb_misc.c b/drivers/video/matrox/matroxfb_misc.c index 455a46ce840c..263d801ef78f 100644 --- a/drivers/video/matrox/matroxfb_misc.c +++ b/drivers/video/matrox/matroxfb_misc.c | |||
@@ -84,7 +84,6 @@ | |||
84 | * | 84 | * |
85 | */ | 85 | */ |
86 | 86 | ||
87 | /* make checkconfig does not check includes for this... */ | ||
88 | #include <linux/config.h> | 87 | #include <linux/config.h> |
89 | 88 | ||
90 | #include "matroxfb_misc.h" | 89 | #include "matroxfb_misc.h" |
diff --git a/scripts/checkconfig.pl b/scripts/checkconfig.pl deleted file mode 100755 index ca1f231b15a6..000000000000 --- a/scripts/checkconfig.pl +++ /dev/null | |||
@@ -1,65 +0,0 @@ | |||
1 | #! /usr/bin/perl | ||
2 | # | ||
3 | # checkconfig: find uses of CONFIG_* names without matching definitions. | ||
4 | # Copyright abandoned, 1998, Michael Elizabeth Chastain <mailto:mec@shout.net>. | ||
5 | |||
6 | use integer; | ||
7 | |||
8 | $| = 1; | ||
9 | |||
10 | foreach $file (@ARGV) | ||
11 | { | ||
12 | # Open this file. | ||
13 | open(FILE, $file) || die "Can't open $file: $!\n"; | ||
14 | |||
15 | # Initialize variables. | ||
16 | my $fInComment = 0; | ||
17 | my $fInString = 0; | ||
18 | my $fUseConfig = 0; | ||
19 | my $iLinuxConfig = 0; | ||
20 | my %configList = (); | ||
21 | |||
22 | LINE: while ( <FILE> ) | ||
23 | { | ||
24 | # Strip comments. | ||
25 | $fInComment && (s+^.*?\*/+ +o ? ($fInComment = 0) : next); | ||
26 | m+/\*+o && (s+/\*.*?\*/+ +go, (s+/\*.*$+ +o && ($fInComment = 1))); | ||
27 | |||
28 | # Pick up definitions. | ||
29 | if ( m/^\s*#/o ) | ||
30 | { | ||
31 | $iLinuxConfig = $. if m/^\s*#\s*include\s*"linux\/config\.h"/o; | ||
32 | $configList{uc $1} = 1 if m/^\s*#\s*include\s*"config\/(\S*)\.h"/o; | ||
33 | } | ||
34 | |||
35 | # Strip strings. | ||
36 | $fInString && (s+^.*?"+ +o ? ($fInString = 0) : next); | ||
37 | m+"+o && (s+".*?"+ +go, (s+".*$+ +o && ($fInString = 1))); | ||
38 | |||
39 | # Pick up definitions. | ||
40 | if ( m/^\s*#/o ) | ||
41 | { | ||
42 | $iLinuxConfig = $. if m/^\s*#\s*include\s*<linux\/config\.h>/o; | ||
43 | $configList{uc $1} = 1 if m/^\s*#\s*include\s*<config\/(\S*)\.h>/o; | ||
44 | $configList{$1} = 1 if m/^\s*#\s*define\s+CONFIG_(\w*)/o; | ||
45 | $configList{$1} = 1 if m/^\s*#\s*undef\s+CONFIG_(\w*)/o; | ||
46 | } | ||
47 | |||
48 | # Look for usages. | ||
49 | next unless m/CONFIG_/o; | ||
50 | WORD: while ( m/\bCONFIG_(\w+)/og ) | ||
51 | { | ||
52 | $fUseConfig = 1; | ||
53 | last LINE if $iLinuxConfig; | ||
54 | next WORD if exists $configList{$1}; | ||
55 | print "$file: $.: need CONFIG_$1.\n"; | ||
56 | $configList{$1} = 0; | ||
57 | } | ||
58 | } | ||
59 | |||
60 | # Report superfluous includes. | ||
61 | if ( $iLinuxConfig && ! $fUseConfig ) | ||
62 | { print "$file: $iLinuxConfig: linux/config.h not needed.\n"; } | ||
63 | |||
64 | close(FILE); | ||
65 | } | ||