diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-11 15:13:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-11 15:13:41 -0700 |
| commit | 58ccab91342c1cc1fe08da9b198ac5d763706c2e (patch) | |
| tree | 0f802231888dfff152033244fbcd72d7561083b7 | |
| parent | edf15b4d4b01b565cb5f4fd2e2d08940b9f92e2f (diff) | |
| parent | c0ddc8c745b7f89c50385fd7aa03c78dc543fa7a (diff) | |
| download | linux-58ccab91342c1cc1fe08da9b198ac5d763706c2e.tar.gz | |
Merge tag 'localmodconfig-v4.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig
Pull localmodconfig fix from Steven Rostedt:
"Leonidas Spyropoulos found that modules like nouveau were being
unselected by make localmodconfig even though their configs were set
and the module was loaded and visible by lsmod.
The reason for this was because streamline-config.pl only looks at
Makefiles, and not Kbuild files. As these modules use Kbuild for
their names, they too need to be checked by localmodconfig. This was
fixed by Richard Weinberger"
* tag 'localmodconfig-v4.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig:
localmodconfig: Use Kbuild files too
| -rwxr-xr-x | scripts/kconfig/streamline_config.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl index 9cb8522d8d22a8..f3d3fb42b8735e 100755 --- a/scripts/kconfig/streamline_config.pl +++ b/scripts/kconfig/streamline_config.pl @@ -137,7 +137,7 @@ my $ksource = ($ARGV[0] ? $ARGV[0] : '.'); my $kconfig = $ARGV[1]; my $lsmod_file = $ENV{'LSMOD'}; -my @makefiles = `find $ksource -name Makefile 2>/dev/null`; +my @makefiles = `find $ksource -name Makefile -or -name Kbuild 2>/dev/null`; chomp @makefiles; my %depends; |