modprobe -l is either deprecated or removed, so let's replace it. Signed-of-by: Rick Farina <sidhayn@xxxxxxxxx> --- Makefile | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index e3d9128..1f8ab91 100644 --- a/Makefile +++ b/Makefile @@ -6,13 +6,6 @@ else export KLIB:= /lib/modules/$(shell uname -r) endif export KLIB_BUILD ?= $(KLIB)/build -# Sometimes not available in the path -MODPROBE := /sbin/modprobe - -ifneq ($(wildcard $(MODPROBE)),) -MADWIFI=$(shell $(MODPROBE) -l ath_pci) -OLD_IWL=$(shell $(MODPROBE) -l iwl4965) -endif DESTDIR?= @@ -188,7 +181,7 @@ install-scripts: $(MODPROBE) @install scripts/athload $(DESTDIR)/usr/sbin/ @install scripts/b43load $(DESTDIR)/usr/sbin/ @install scripts/iwl-load $(DESTDIR)/usr/sbin/ - @if [ ! -z "$(MADWIFI)" ] && [ -z "$(DESTDIR)" ]; then \ + @if `modinfo ath_pci > /dev/null 2>&1` && [ -z "$(DESTDIR)" ]; then \ echo ;\ echo -n "Note: madwifi detected, we're going to disable it. " ;\ echo "If you would like to enable it later you can run:" ;\ @@ -197,7 +190,7 @@ install-scripts: $(MODPROBE) echo Running athenable ath5k...;\ /usr/sbin/athenable ath5k ;\ fi - @if [ ! -z "$(OLD_IWL)" ] && [ -z "$(DESTDIR)" ]; then \ + @if `modinfo iwl4965 > /dev/null 2>&1` && [ -z "$(DESTDIR)" ]; then \ echo ;\ echo -n "Note: iwl4965 detected, we're going to disable it. " ;\ echo "If you would like to enable it later you can run:" ;\ -- 1.7.3.4 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
