From 10b8469cdc5934da670629ec78f144a9af68f504 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Tue, 29 Mar 2011 17:56:16 -0700 Subject: [PATCH] --- yaml --- r: 249004 b: refs/heads/master c: 1e6d4562eb7f2ecef9c03639f2ca6f3e6d6fdf7e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/ath6kl/Makefile | 4 ---- trunk/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h | 4 ++-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 31f7b065667f..1db7f6055e1b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 492543eae4f95a746c9d10265c78a3d2853ac315 +refs/heads/master: 1e6d4562eb7f2ecef9c03639f2ca6f3e6d6fdf7e diff --git a/trunk/drivers/staging/ath6kl/Makefile b/trunk/drivers/staging/ath6kl/Makefile index 888b8fccaf0c..4dbfb65c2c83 100644 --- a/trunk/drivers/staging/ath6kl/Makefile +++ b/trunk/drivers/staging/ath6kl/Makefile @@ -29,10 +29,6 @@ ccflags-y += -I$(obj)/os ccflags-y += -I$(obj)/bmi/include ccflags-y += -I$(obj)/include/common/AR6002/hw4.0 -ifeq ($(CONFIG_AR600x_WB31_XXX),y) -ccflags-y += -DAR600x_WB31_XXX -endif - ifeq ($(CONFIG_AR600x_SD32_XXX),y) ccflags-y += -DAR600x_SD32_XXX endif diff --git a/trunk/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h b/trunk/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h index f089242c66bc..1d6b26371201 100644 --- a/trunk/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h +++ b/trunk/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h @@ -287,7 +287,7 @@ typedef enum _AR6K_BIN_FILE { #define AR6003_REV1_BOARD_DATA_FILE "ath6k/AR6003/hw1.0/bdata.SD31.bin" #elif defined(AR600x_SD32_XXX) #define AR6003_REV1_BOARD_DATA_FILE "ath6k/AR6003/hw1.0/bdata.SD32.bin" -#elif defined(AR600x_WB31_XXX) +#elif defined(CONFIG_AR600x_WB31_XXX) #define AR6003_REV1_BOARD_DATA_FILE "ath6k/AR6003/hw1.0/bdata.WB31.bin" #else #define AR6003_REV1_BOARD_DATA_FILE "ath6k/AR6003/hw1.0/bdata.CUSTOM.bin" @@ -307,7 +307,7 @@ typedef enum _AR6K_BIN_FILE { #define AR6003_REV2_BOARD_DATA_FILE "ath6k/AR6003/hw2.0/bdata.SD31.bin" #elif defined(AR600x_SD32_XXX) #define AR6003_REV2_BOARD_DATA_FILE "ath6k/AR6003/hw2.0/bdata.SD32.bin" -#elif defined(AR600x_WB31_XXX) +#elif defined(CONFIG_AR600x_WB31_XXX) #define AR6003_REV2_BOARD_DATA_FILE "ath6k/AR6003/hw2.0/bdata.WB31.bin" #else #define AR6003_REV2_BOARD_DATA_FILE "ath6k/AR6003/hw2.0/bdata.CUSTOM.bin"