diff --git a/[refs] b/[refs]
index 1db7f6055e1b..348e6babe81b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e6d4562eb7f2ecef9c03639f2ca6f3e6d6fdf7e
+refs/heads/master: 42ad85dbc1c594f34a272ddbaee6387f4f369f8a
diff --git a/trunk/drivers/staging/ath6kl/Makefile b/trunk/drivers/staging/ath6kl/Makefile
index 4dbfb65c2c83..3df4c86ee671 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_SD32_XXX),y)
-ccflags-y += -DAR600x_SD32_XXX
-endif
-
 ifeq ($(CONFIG_AR600x_CUSTOM_XXX),y)
 ccflags-y += -DAR600x_CUSTOM_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 1d6b26371201..764f8f184fe9 100644
--- a/trunk/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
+++ b/trunk/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
@@ -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"
@@ -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"