Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e882335bb19c0b9f96971fa6b1fe6c019280056b

Authored by Alexander Beregalov
Committed by Greg Kroah-Hartman
1 parent 70f38b1053
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

Staging: vt665x: depend on WIRELESS_EXT 

Make vt665x depended on WIRELESS_EXT and remove remain ifdef's

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 7 changed files with 2 additions and 27 deletions Side-by-side Diff

drivers/staging/vt6655/Kconfig
Diff comments   View file @ e882335
1 1 config VT6655
2 2 tristate "VIA Technologies VT6655 support"
3   - depends on PCI
  3 + depends on WIRELESS_EXT && PCI
4 4 ---help---
5 5 This is a vendor-written driver for VIA VT6655.
drivers/staging/vt6655/device.h
Diff comments   View file @ e882335
... ... @@ -950,9 +950,7 @@
950 950 UINT uChannel;
951 951 BOOL bMACSuspend;
952 952  
953   -#ifdef WIRELESS_EXT
954 953 struct iw_statistics wstats; // wireless stats
955   -#endif /* WIRELESS_EXT */
956 954 BOOL bCommit;
957 955  
958 956 } DEVICE_INFO, *PSDevice;
drivers/staging/vt6655/device_main.c
Diff comments   View file @ e882335
... ... @@ -1146,9 +1146,7 @@
1146 1146 dev->irq = pcid->irq;
1147 1147 dev->netdev_ops = &device_netdev_ops;
1148 1148  
1149   -#ifdef CONFIG_WIRELESS_EXT
1150 1149 dev->wireless_handlers = (struct iw_handler_def *)&iwctl_handler_def;
1151   -#endif
1152 1150  
1153 1151 rc = register_netdev(dev);
1154 1152 if (rc)
1155 1153  
... ... @@ -3396,10 +3394,8 @@
3396 3394 PSDevice pDevice = (PSDevice)netdev_priv(dev);
3397 3395 #endif
3398 3396  
3399   -#ifdef WIRELESS_EXT
3400 3397 struct iwreq *wrq = (struct iwreq *) rq;
3401 3398 int rc =0;
3402   -#endif
3403 3399 PSMgmtObject pMgmt = pDevice->pMgmt;
3404 3400 PSCmdRequest pReq;
3405 3401  
... ... @@ -3411,8 +3407,6 @@
3411 3407  
3412 3408 switch(cmd) {
3413 3409  
3414   -#ifdef WIRELESS_EXT
3415   -
3416 3410 case SIOCGIWNAME:
3417 3411 rc = iwctl_giwname(dev, NULL, (char *)&(wrq->u.name), NULL);
3418 3412 break;
... ... @@ -3750,8 +3744,6 @@
3750 3744  
3751 3745 #endif // #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
3752 3746 //End Add -- //2008-0409-07, <Add> by Einsn Liu
3753   -
3754   -#endif // WIRELESS_EXT
3755 3747  
3756 3748 case IOCTL_CMD_TEST:
3757 3749  
drivers/staging/vt6655/iwctl.c
Diff comments   View file @ e882335
... ... @@ -80,8 +80,6 @@
80 80 #define SUPPORTED_WIRELESS_EXT 17
81 81 #endif
82 82  
83   -#ifdef WIRELESS_EXT
84   -
85 83 static const long frequency_list[] = {
86 84 2412, 2417, 2422, 2427, 2432, 2437, 2442, 2447, 2452, 2457, 2462, 2467, 2472, 2484,
87 85 4915, 4920, 4925, 4935, 4940, 4945, 4960, 4980,
88 86  
... ... @@ -90,9 +88,7 @@
90 88 5700, 5745, 5765, 5785, 5805, 5825
91 89 };
92 90  
93   -#endif
94 91  
95   -
96 92 /*--------------------- Static Classes ----------------------------*/
97 93  
98 94  
... ... @@ -105,8 +101,6 @@
105 101  
106 102 /*--------------------- Export Variables --------------------------*/
107 103  
108   -#ifdef WIRELESS_EXT
109   -
110 104 struct iw_statistics *iwctl_get_wireless_stats(struct net_device *dev)
111 105 {
112 106 PSDevice pDevice = netdev_priv(dev);
... ... @@ -2314,8 +2308,4 @@
2314 2308 .private = NULL,
2315 2309 .private_args = NULL,
2316 2310 };
2317   -
2318   -
2319   -
2320   -#endif // WIRELESS_EXT
drivers/staging/vt6655/iwctl.h
Diff comments   View file @ e882335
... ... @@ -50,8 +50,6 @@
50 50 #endif /* __cplusplus */
51 51  
52 52  
53   -#ifdef WIRELESS_EXT
54   -
55 53 struct iw_statistics *iwctl_get_wireless_stats (struct net_device *dev);
56 54  
57 55  
... ... @@ -230,8 +228,6 @@
230 228 char *extra);
231 229 #endif // #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
232 230  
233   -
234   -#endif
235 231  
236 232 extern const struct iw_handler_def iwctl_handler_def;
237 233 extern const struct iw_priv_args iwctl_private_args;
drivers/staging/vt6656/Kconfig
Diff comments   View file @ e882335
1 1 config VT6656
2 2 tristate "VIA Technologies VT6656 support"
  3 + depends on WIRELESS_EXT && USB
3 4 ---help---
4 5 This is a vendor-written driver for VIA VT6656.
drivers/staging/vt6656/main_usb.c
Diff comments   View file @ e882335
... ... @@ -856,9 +856,7 @@
856 856  
857 857 netdev->netdev_ops = &device_netdev_ops;
858 858  
859   -#ifdef CONFIG_WIRELESS_EXT
860 859 netdev->wireless_handlers = (struct iw_handler_def *)&iwctl_handler_def;
861   -#endif /* WIRELESS_EXT */
862 860  
863 861 //2008-0623-01<Remark>by MikeLiu
864 862 //2007-0821-01<Add>by MikeLiu