From 47054cd1ec9cf60cb856880914d3a6266ec7a349 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 18 Oct 2011 13:36:04 -0700 Subject: [PATCH] --- yaml --- r: 268842 b: refs/heads/master c: 5f9819c70991e7a4c68fb620fcfa80c5b38c4f86 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/wlags49_h25/Makefile | 25 ---------------------- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/[refs] b/[refs] index cf457b68a3cc..8f1abffd3da7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74116f561add85d03faabda3200e824dfeb9b6fe +refs/heads/master: 5f9819c70991e7a4c68fb620fcfa80c5b38c4f86 diff --git a/trunk/drivers/staging/wlags49_h25/Makefile b/trunk/drivers/staging/wlags49_h25/Makefile index fe8292996108..6e0159d0a340 100644 --- a/trunk/drivers/staging/wlags49_h25/Makefile +++ b/trunk/drivers/staging/wlags49_h25/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,10 +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 $(WLNAME)-y += wl_profile.o \ @@ -58,23 +53,3 @@ $(WLNAME)-y += wl_profile.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 -