From d03a2de5d32ab1af36d7a77ce4b2899e5f871bf0 Mon Sep 17 00:00:00 2001
From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 6 Aug 2007 18:48:58 +0000
Subject: More rdc-2.6 fixes by Daniel Gimpelevich, thanks !

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8355 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/rt2x00/src/Makefile        |  2 +-
 package/rt2x00/src/rt2x00_config.h | 30 ++++--------------------------
 2 files changed, 5 insertions(+), 27 deletions(-)

(limited to 'package/rt2x00/src')

diff --git a/package/rt2x00/src/Makefile b/package/rt2x00/src/Makefile
index 4f3304f9a8..0ed8321e36 100644
--- a/package/rt2x00/src/Makefile
+++ b/package/rt2x00/src/Makefile
@@ -1,4 +1,4 @@
-rt2x00lib-objs := rt2x00dev.o rt2x00mac.o
+rt2x00lib-objs := rt2x00dev.o rt2x00mac.o rt2x00firmware.o
 
 EXTRA_CFLAGS += -DCONFIG_RT2X00_LIB_FIRMWARE
 
diff --git a/package/rt2x00/src/rt2x00_config.h b/package/rt2x00/src/rt2x00_config.h
index 8d6343461e..5751dd1f79 100644
--- a/package/rt2x00/src/rt2x00_config.h
+++ b/package/rt2x00/src/rt2x00_config.h
@@ -12,6 +12,10 @@
 
 #undef CONFIG_RT2X00_ASM
 
+#ifndef CONFIG_RT2X00_LIB_FIRMWARE
+#define CONFIG_RT2X00_LIB_FIRMWARE
+#endif
+
 #ifndef CONFIG_RT2400PCI
 #define CONFIG_RT2400PCI
 #endif
@@ -38,29 +42,3 @@
 #define CONFIG_RT73USB
 #endif
 
-#ifndef CONFIG_D80211
-#define CONFIG_D80211
-#endif
-
-#ifndef CONFIG_D80211_DEBUG
-#define CONFIG_D80211_DEBUG
-#endif
-
-#undef CONFIG_D80211_ASM
-
-#ifndef CONFIG_CRC_ITU_T
-#define CONFIG_CRC_ITU_T
-#endif
-
-#undef CONFIG_CRC_ITU_T_ASM
-
-#ifndef CONFIG_EEPROM_93CX6
-#define CONFIG_EEPROM_93CX6
-#endif
-
-#undef CONFIG_EEPROM_93CX6_ASM
-
-#undef CONFIG_RFKILL
-
-#undef CONFIG_RFKILL_ASM
-
-- 
cgit v1.2.3