Fix typos

[madwifi/.git] / Makefile.inc

diff --git a/Makefile.inc b/Makefile.inc
index 9c4ab3a70f1b913d8a2ab269379064b5fb36b91b..496cbbdb42e363a24d563c876b1343d6752266a2 100644 (file)
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -92,15 +92,6 @@ $(error KERNELCONF: $(KERNELCONF) does not exist.)
 endif
 include $(KERNELCONF)
 
-# Determine architecture of the kernel.
-include $(TOP)/scripts/get_arch.mk
-export ARCH
-
-# Determine TARGET
-include $(TOP)/ath_hal/ah_target.inc
-export TARGET
-COPTS += -DTARGET='"$(TARGET)"'
-
 # KMODPATH nominates the directory where the modules will be
 # installed to
 KMODPATH :=    /lib/modules/$(KERNELRELEASE)/net
@@ -124,13 +115,9 @@ NM=                nm
 # Path to the HAL source code.
 #
 ifeq ($(HAL),)
-HAL=   $(TOP)/hal
+HAL=   $(TOP)/ath_hal
 endif
 #
-# Path to HAL/OS interface code
-#
-ATH_HAL= $(TOP)/ath_hal
-#
 # Path to the 802.11 include files.
 #
 WLAN=  $(TOP)/net80211
@@ -145,22 +132,12 @@ ATH_RATE= $(TOP)/ath_rate
 #
 # Path to the userspace utilities. 
 # 
-TOOLS=  $(TOP)/tools 
+TOOLS=  $(TOP)/tools
 
-WARNINGS = -Werror
+WARNINGS = -Werror -Wall
 COPTS+= $(WARNINGS)
 INCS=  -include $(TOP)/include/compat.h -I$(TOP)/include
 
-# TARGET defines the target platform architecture. It must match one of
-# the target platforms supported by the HAL. The default target is the
-# host machine architecture. You can override TARGET on the make command
-# line or in the environment. See hal/linux/*.inc for the list of
-# supported targets.
-ifeq (,$(wildcard $(HAL)/public/$(TARGET).inc))
-TARGETS=$(basename $(notdir $(wildcard $(HAL)/public/*.inc)))
-$(error TARGET $(TARGET) is invalid, valid targets are: $(TARGETS))
-endif
-
 ifndef ATH_DEBUG_SPINLOCKS
 export ATH_DEBUG_SPINLOCKS=0
 endif
@@ -173,22 +150,10 @@ ifndef HAL_DEBUG
 export HAL_DEBUG=0
 endif
 
-ifndef ALQ
-export ALQ=0
-endif
-
 ifndef ATH_DEBUG
 export ATH_DEBUG=1
 endif
 
-ifndef MMIOTRACE
-export MMIOTRACE=0
-endif
-
-ifeq ($(strip $(MMIOTRACE)),1)
-EXTRA_CFLAGS += -DMMIOTRACE=1
-endif
-
 ifeq ($(strip $(ATH_DEBUG_SPINLOCKS)),1)
 COPTS+= -DATH_DEBUG_SPINLOCKS=1
 endif
@@ -204,28 +169,6 @@ ifeq ($(strip $(HAL_DEBUG)),1)
 COPTS+= -fno-inline -DAH_DEBUG=1
 endif
 
-ifeq ($(strip $(ALQ)),1)
-obj-m += alq.o
-alq-objs := kern_alq.o
-EXTRA_CFLAGS += -DAH_DEBUG_ALQ -DAH_DEBUG
-endif
-
-# Don't let HAL mess with the toolchain - save toolchain variables
-save_CC := $(CC)
-save_LD := $(LD)
-save_STRIP := $(STRIP)
-save_OBJCOPY := $(OBJCOPY)
-save_NM := $(NM)
-
-include $(HAL)/public/$(TARGET).inc
-
-# Restore toolchain variables
-CC := $(save_CC)
-LD := $(save_LD)
-STRIP := $(save_STRIP)
-OBJCOPY := $(save_OBJCOPY)
-NM := $(save_NM)
-
 include $(TOP)/BuildCaps.inc
 
 ifeq ($(strip $(ATH_DEBUG)),1)
@@ -243,9 +186,6 @@ endif
 # Ensure correct endianess
 LDFLAGS += $(LDOPTS)
 
-# Be pedantic
-EXTRA_CFLAGS += -Wall
-
 # Filter out compiler options that are not supported by all compilers
 # and that are not needed to ensure compatible architecture and calling
 # conventions.