1
In kernel 2.6.26 and older CONFIG_IWL4965 was build as an extra
2
module, but now it is directly included in the iwlagn.
4
CONFIG_IWL4965 has to be set to y, to build correctly.
6
zd1211rw does not build with kernel < 2.6.28, but it is often activated
7
in the kernel config of older kernels. We rename the option to
8
deactivate it on older kernels.
9
CONFIG_BT_L2CAP and CONFIG_BT_SCO are boolean now, but often set to m
12
CONFIG_BT_HIDP does not build with older kernel versions.
14
--- a/drivers/net/wireless/Makefile
15
+++ b/drivers/net/wireless/Makefile
16
@@ -21,7 +21,7 @@ obj-$(CONFIG_PRISM54) += prism54/
17
obj-$(CONFIG_HOSTAP) += hostap/
18
obj-$(CONFIG_B43) += b43/
19
obj-$(CONFIG_B43LEGACY) += b43legacy/
20
-obj-$(CONFIG_ZD1211RW) += zd1211rw/
21
+obj-$(CONFIG_COMPAT_ZD1211RW) += zd1211rw/
22
obj-$(CONFIG_RTL8180) += rtl818x/
23
obj-$(CONFIG_RTL8187) += rtl818x/
24
obj-$(CONFIG_RTLWIFI) += rtlwifi/
25
--- a/drivers/net/wireless/iwlegacy/Makefile
26
+++ b/drivers/net/wireless/iwlegacy/Makefile
27
@@ -10,7 +10,7 @@ iwl-legacy-objs += $(iwl-legacy-m)
28
CFLAGS_iwl-devtrace.o := -I$(src)
31
-obj-$(CONFIG_IWL4965) += iwl4965.o
32
+obj-$(CONFIG_COMPAT_IWL4965) += iwl4965.o
33
iwl4965-objs := iwl-4965.o iwl4965-base.o iwl-4965-rs.o iwl-4965-led.o
34
iwl4965-objs += iwl-4965-ucode.o iwl-4965-tx.o
35
iwl4965-objs += iwl-4965-lib.o iwl-4965-rx.o iwl-4965-calib.o
36
--- a/drivers/net/wireless/iwlegacy/iwl-dev.h
37
+++ b/drivers/net/wireless/iwlegacy/iwl-dev.h
38
@@ -1221,7 +1221,7 @@ struct iwl_priv {
42
-#if defined(CONFIG_IWL4965) || defined(CONFIG_IWL4965_MODULE)
43
+#if defined(CONFIG_COMPAT_IWL4965) || defined(CONFIG_COMPAT_IWL4965_MODULE)
46
* reporting the number of tids has AGG on. 0 means
47
--- a/drivers/net/wireless/iwlegacy/iwl4965-base.c
48
+++ b/drivers/net/wireless/iwlegacy/iwl4965-base.c
49
@@ -3556,10 +3556,10 @@ void iwl4965_txq_set_sched(struct iwl_pr
51
/* Hardware specific file defines the PCI IDs table for that hardware module */
52
static DEFINE_PCI_DEVICE_TABLE(iwl4965_hw_card_ids) = {
53
-#if defined(CONFIG_IWL4965_MODULE) || defined(CONFIG_IWL4965)
54
+#if defined(CONFIG_COMPAT_IWL4965_MODULE) || defined(CONFIG_COMPAT_IWL4965)
55
{IWL_PCI_DEVICE(0x4229, PCI_ANY_ID, iwl4965_cfg)},
56
{IWL_PCI_DEVICE(0x4230, PCI_ANY_ID, iwl4965_cfg)},
57
-#endif /* CONFIG_IWL4965 */
58
+#endif /* CONFIG_COMPAT_IWL4965 */
62
--- a/drivers/net/wireless/zd1211rw/Makefile
63
+++ b/drivers/net/wireless/zd1211rw/Makefile
65
-obj-$(CONFIG_ZD1211RW) += zd1211rw.o
66
+obj-$(CONFIG_COMPAT_ZD1211RW) += zd1211rw.o
68
zd1211rw-objs := zd_chip.o zd_mac.o \
69
zd_rf_al2230.o zd_rf_rf2959.o \
70
--- a/include/net/bluetooth/bluetooth.h
71
+++ b/include/net/bluetooth/bluetooth.h
72
@@ -205,7 +205,7 @@ extern void bt_sysfs_cleanup(void);
74
extern struct dentry *bt_debugfs;
76
-#ifdef CONFIG_BT_L2CAP
77
+#ifdef CONFIG_COMPAT_BT_L2CAP
79
void l2cap_exit(void);
81
@@ -219,7 +219,7 @@ static inline void l2cap_exit(void)
86
+#ifdef CONFIG_COMPAT_BT_SCO
90
--- a/net/bluetooth/Makefile
91
+++ b/net/bluetooth/Makefile
92
@@ -6,8 +6,8 @@ obj-$(CONFIG_BT) += bluetooth.o
93
obj-$(CONFIG_BT_RFCOMM) += rfcomm/
94
obj-$(CONFIG_BT_BNEP) += bnep/
95
obj-$(CONFIG_BT_CMTP) += cmtp/
96
-obj-$(CONFIG_BT_HIDP) += hidp/
97
+obj-$(CONFIG_COMPAT_BT_HIDP) += hidp/
99
bluetooth-y := af_bluetooth.o hci_core.o hci_conn.o hci_event.o mgmt.o hci_sock.o hci_sysfs.o lib.o
100
-bluetooth-$(CONFIG_BT_L2CAP) += l2cap_core.o l2cap_sock.o
101
-bluetooth-$(CONFIG_BT_SCO) += sco.o
102
+bluetooth-$(CONFIG_COMPAT_BT_L2CAP) += l2cap_core.o l2cap_sock.o
103
+bluetooth-$(CONFIG_COMPAT_BT_SCO) += sco.o
104
--- a/net/bluetooth/hidp/Makefile
105
+++ b/net/bluetooth/hidp/Makefile
107
# Makefile for the Linux Bluetooth HIDP layer
110
-obj-$(CONFIG_BT_HIDP) += hidp.o
111
+obj-$(CONFIG_COMPAT_BT_HIDP) += hidp.o
113
hidp-objs := core.o sock.o
114
--- a/drivers/net/wireless/wl12xx/Makefile
115
+++ b/drivers/net/wireless/wl12xx/Makefile
116
@@ -8,9 +8,9 @@ wl12xx_sdio_test-objs = sdio_test.o
117
wl12xx-$(CONFIG_NL80211_TESTMODE) += testmode.o
118
obj-$(CONFIG_WL12XX) += wl12xx.o
119
obj-$(CONFIG_WL12XX_SPI) += wl12xx_spi.o
120
-obj-$(CONFIG_WL12XX_SDIO) += wl12xx_sdio.o
121
+obj-$(CONFIG_COMPAT_WL12XX_SDIO) += wl12xx_sdio.o
123
-obj-$(CONFIG_WL12XX_SDIO_TEST) += wl12xx_sdio_test.o
124
+obj-$(CONFIG_COMPAT_WL12XX_SDIO_TEST) += wl12xx_sdio_test.o
126
# small builtin driver bit
127
obj-$(CONFIG_WL12XX_PLATFORM_DATA) += wl12xx_platform_data.o
128
--- a/drivers/net/wireless/wl1251/Makefile
129
+++ b/drivers/net/wireless/wl1251/Makefile
130
@@ -5,4 +5,4 @@ wl1251_sdio-objs += sdio.o
132
obj-$(CONFIG_WL1251) += wl1251.o
133
obj-$(CONFIG_WL1251_SPI) += wl1251_spi.o
134
-obj-$(CONFIG_WL1251_SDIO) += wl1251_sdio.o
135
+obj-$(CONFIG_COMPAT_WL1251_SDIO) += wl1251_sdio.o