diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-25 12:11:25 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-25 12:11:25 -0800 |
commit | 1e73fde581e2d34c4ff04eb10671711845c79bad (patch) | |
tree | d876efe406125bf38b4d361759d67604bea2934f /scripts/depmod.sh | |
parent | a32744d4abae24572eff7269bc17895c41bd0085 (diff) | |
parent | 42f1c01b79d54a00012c553b95fc7fe266d82394 (diff) |
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
three kbuild fixes for 3.3:
- make deb-pkg symlink race fix.
- make coccicheck fix.
- Dropping the check for modutils. This is not a regression, but
allows the module-init-tools replacement kmod work with the 3.3
kernel.
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
coccicheck: change handling of C={1,2} when M= is set
builddeb: Don't create files in /tmp with predictable names
kbuild: do not check for ancient modutils tools
Diffstat (limited to 'scripts/depmod.sh')
-rwxr-xr-x | scripts/depmod.sh | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/scripts/depmod.sh b/scripts/depmod.sh index a2723568594..2ae48170314 100755 --- a/scripts/depmod.sh +++ b/scripts/depmod.sh @@ -9,12 +9,6 @@ fi DEPMOD=$1 KERNELRELEASE=$2 -if ! "$DEPMOD" -V 2>/dev/null | grep -q module-init-tools; then - echo "Warning: you may need to install module-init-tools" >&2 - echo "See http://www.codemonkey.org.uk/docs/post-halloween-2.6.txt" >&2 - sleep 1 -fi - if ! test -r System.map -a -x "$DEPMOD"; then exit 0 fi |