commit e96ad6dbcadd7370c7ba71b20618b0370dc5fa8f Author: Jiri Slaby Date: Tue Jun 19 23:26:30 2007 +0200 remove ahb diff --git a/Makefile b/Makefile index e891fe0..cbd7dfa 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,9 @@ KDIR=/lib/modules/$(shell uname -r)/build KBUILD=$(MAKE) -C $(KDIR) M=$(PWD) -ifeq ($(strip $(BUS)),AHB) -EXTRA_CFLAGS += -DATH_AHB -bus=ath -else -EXTRA_CFLAGS += -DATH_PCI -bus=pci -endif - EXTRA_CFLAGS += -I$(src)/openhal -ath5k-objs := ath/if_ath.o ath/if_ath_$(bus).o openhal/ath5k_hw.o \ +ath5k-objs := ath/if_ath.o ath/if_ath_pci.o openhal/ath5k_hw.o \ openhal/ieee80211_regdomain.o #ath/radar.o obj-m += ath5k.o diff --git a/ath/if_ath.c b/ath/if_ath.c index 3de318a..e2dc8ee 100644 --- a/ath/if_ath.c +++ b/ath/if_ath.c @@ -40,9 +40,6 @@ * This software is derived from work of Atsushi Onoe; his contribution * is greatly appreciated. */ -#ifndef AUTOCONF_INCLUDED -#include -#endif #include #include #include @@ -67,16 +64,9 @@ /*#include "radar.h"*/ +#include "if_ath_pci.h" #include "if_athvar.h" #include "ath5k.h" - -#ifdef ATH_PCI /* PCI BUS */ -#include "if_ath_pci.h" -#endif /* PCI BUS */ -#ifdef ATH_AHB /* AHB BUS */ -#include "if_ath_ahb.h" -#endif /* AHB BUS */ - #include "ath_hw.h" #define KASSERT(exp, msg...) do { \