From 148d33ea1ed51b47138ce95f6f29f6c93b8e5620 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 18 Oct 2011 13:34:59 -0700 Subject: [PATCH] --- yaml --- r: 268841 b: refs/heads/master c: 74116f561add85d03faabda3200e824dfeb9b6fe h: refs/heads/master i: 268839: 91ef6be84663c509e706172df82d988a7cb365cd v: v3 --- [refs] | 2 +- trunk/drivers/staging/wlags49_h2/Makefile | 25 ----------------------- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/[refs] b/[refs] index 81218cec64ae..cf457b68a3cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d199fb7d6d83e185fde1a784ea9e45103db19581 +refs/heads/master: 74116f561add85d03faabda3200e824dfeb9b6fe diff --git a/trunk/drivers/staging/wlags49_h2/Makefile b/trunk/drivers/staging/wlags49_h2/Makefile index c7220c610961..31e1d89a3846 100644 --- a/trunk/drivers/staging/wlags49_h2/Makefile +++ b/trunk/drivers/staging/wlags49_h2/Makefile @@ -11,7 +11,6 @@ # # If you want to build AP support (untested), comment out -DSTA_ONLY -INSTALLDIR := /lib/modules/$(shell uname -r)/kernel/drivers/net/wireless ccflags-y := -I$(KERNELDIR)/include ccflags-y += -I$(src) \ -DBUS_PCMCIA \ @@ -38,9 +37,6 @@ $(WLNAME)-y += ap_h25.o endif endif -# If KERNELRELEASE is defined, we've been invoked from the -# kernel build system and can use its language. -ifneq ($(KERNELRELEASE),) obj-m += $(WLNAME).o @@ -57,24 +53,3 @@ $(WLNAME)-y += wl_profile.o \ dhf.o $(WLNAME)-$(CONFIG_SYSFS) += wl_sysfs.o - -# Otherwise we were called directly from the command -# line; invoke the kernel build system. -else - KERNELDIR ?= /lib/modules/$(shell uname -r)/build - PWD := $(shell pwd) - -default: - $(MAKE) -C $(KERNELDIR) M=$(PWD) modules -endif - -clean: - rm -fr *.o *.ko *.mod.c *.mod.o .*.*.cmd Module.symvers \ - Module.markers modules.order .tmp_versions - -install: default - -rmmod $(WLNAME) - install -d $(INSTALLDIR) - install -m 0644 -o root -g root $(WLNAME).ko $(INSTALLDIR) - /sbin/depmod -aq -