From 0e7a3e7a746b5dc6ccf9896e882441c4fdbfd09a Mon Sep 17 00:00:00 2001 From: David Chosrova Date: Mon, 29 Nov 2010 21:50:48 +0100 Subject: Staging: rtl8192u: remove dead code to disable dot11d This patch removes all the ENABLE_DOT11D ifdefs. It is always defined for driver. DOT11D has to do with regulatory domains. What prompted this patch was a warning message in Sparse. drivers/staging/rtl8192u/r8192U_core.c:247:1: warning: "eqMacAddr" redefined in file included from drivers/staging/rtl8192u/:81:81: drivers/staging/rtl8192u/dot11d.h:35:1: warning: this is the location of the previous definition Now there are no ifdefs around dot11d.h it made no sense to have this second definition, so I removed that macro as well. ( Thanks Dan ;-) ). Acked-by. Dan Carpenter Signed-off-by: David Chosrova Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8192u/ieee80211/Makefile | 2 -- 1 file changed, 2 deletions(-) (limited to 'drivers/staging/rtl8192u/ieee80211/Makefile') diff --git a/drivers/staging/rtl8192u/ieee80211/Makefile b/drivers/staging/rtl8192u/ieee80211/Makefile index 45704f8..0775c55 100644 --- a/drivers/staging/rtl8192u/ieee80211/Makefile +++ b/drivers/staging/rtl8192u/ieee80211/Makefile @@ -20,7 +20,6 @@ ifeq ($(NIC_SELECT),RTL8192U) endif #ccflags-y := -DJOHN_NOCPY #flags to enable or disble 80211D feature -ccflags-y += -DENABLE_DOT11D ieee80211-rsl-objs := ieee80211_rx.o \ ieee80211_softmac.o \ ieee80211_tx.o \ @@ -75,7 +74,6 @@ CFLAGS += -I$(KSRC)/include -I. CFLAGS += -DMODVERSIONS -DEXPORT_SYMTAB -include $(KSRC)/include/linux/modversions.h #Kernel 2.4.20 #CFLAGS += -D__NO_VERSION__ -DEXPORT_SYMTAB -#CFLAGS += -DENABLE_DOT11D SMP := $(shell $(CC) $(MODCFLAGS) -E -dM $(CONFIG_FILE) | \ grep CONFIG_SMP | awk '{print $$3}') ifneq ($(SMP),1) -- cgit v1.1