diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
| commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
| tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/wlags49_h2/Makefile | |
| parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
| parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/wlags49_h2/Makefile')
| -rw-r--r-- | drivers/staging/wlags49_h2/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/wlags49_h2/Makefile b/drivers/staging/wlags49_h2/Makefile index 25d0a8a9ce30..e604ebd5aeb5 100644 --- a/drivers/staging/wlags49_h2/Makefile +++ b/drivers/staging/wlags49_h2/Makefile @@ -12,8 +12,8 @@ # If you want to build AP support (untested), comment out -DSTA_ONLY INSTALLDIR := /lib/modules/$(shell uname -r)/kernel/drivers/net/wireless -EXTRA_CFLAGS += -I$(KERNELDIR)/include -EXTRA_CFLAGS += -I$(src) \ +ccflags-y := -I$(KERNELDIR)/include +ccflags-y += -I$(src) \ -DBUS_PCMCIA \ -DUSE_WPA \ -DUSE_WEXT \ @@ -25,16 +25,16 @@ EXTRA_CFLAGS += -I$(src) \ # -DUSE_UIL \ # -DUSE_PROFILE \ -ifeq ($(findstring HERMES25,$(EXTRA_CFLAGS)),) +ifeq ($(findstring HERMES25,$(ccflags-y)),) WLNAME := wlags49_h2_cs $(WLNAME)-y := sta_h2.o -ifeq ($(findstring STA_ONLY,$(EXTRA_CFLAGS)),) +ifeq ($(findstring STA_ONLY,$(ccflags-y)),) $(WLNAME)-y += ap_h2.o endif else WLNAME=wlags49_h25_cs $(WLNAME)-y := sta_h25.o -ifeq ($(findstring STA_ONLY,$(EXTRA_CFLAGS)),) +ifeq ($(findstring STA_ONLY,$(ccflags-y)),) $(WLNAME)-y += ap_h25.o endif endif |