Skip to content

Commit

Permalink
ath6kl: use CONFIG_AR600x_SD32_XXX
Browse files Browse the repository at this point in the history
When CONFIG_AR600x_SD32_XXX gets enabled we define
another flag called AR600x_SD32_XXX, just use
CONFIG_AR600x_SD32_XXX since that is already defined
by the generated autoconf header file from the kernel.

Cc: Naveen Singh <nsingh@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Luis R. Rodriguez authored and Greg Kroah-Hartman committed Apr 5, 2011
1 parent 1e6d456 commit 42ad85d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
4 changes: 0 additions & 4 deletions drivers/staging/ath6kl/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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_SD32_XXX),y)
ccflags-y += -DAR600x_SD32_XXX
endif

ifeq ($(CONFIG_AR600x_CUSTOM_XXX),y)
ccflags-y += -DAR600x_CUSTOM_XXX
endif
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ typedef enum _AR6K_BIN_FILE {
#define AR6003_REV1_EPPING_FIRMWARE_FILE "ath6k/AR6003/hw1.0/endpointping.bin"
#ifdef CONFIG_AR600x_SD31_XXX
#define AR6003_REV1_BOARD_DATA_FILE "ath6k/AR6003/hw1.0/bdata.SD31.bin"
#elif defined(AR600x_SD32_XXX)
#elif defined(CONFIG_AR600x_SD32_XXX)
#define AR6003_REV1_BOARD_DATA_FILE "ath6k/AR6003/hw1.0/bdata.SD32.bin"
#elif defined(CONFIG_AR600x_WB31_XXX)
#define AR6003_REV1_BOARD_DATA_FILE "ath6k/AR6003/hw1.0/bdata.WB31.bin"
Expand All @@ -305,7 +305,7 @@ typedef enum _AR6K_BIN_FILE {
#define AR6003_REV2_EPPING_FIRMWARE_FILE "ath6k/AR6003/hw2.0/endpointping.bin"
#ifdef CONFIG_AR600x_SD31_XXX
#define AR6003_REV2_BOARD_DATA_FILE "ath6k/AR6003/hw2.0/bdata.SD31.bin"
#elif defined(AR600x_SD32_XXX)
#elif defined(CONFIG_AR600x_SD32_XXX)
#define AR6003_REV2_BOARD_DATA_FILE "ath6k/AR6003/hw2.0/bdata.SD32.bin"
#elif defined(CONFIG_AR600x_WB31_XXX)
#define AR6003_REV2_BOARD_DATA_FILE "ath6k/AR6003/hw2.0/bdata.WB31.bin"
Expand Down

0 comments on commit 42ad85d

Please sign in to comment.