Skip to content

Commit 3002b7a

Browse files
committed
Merge tag 'staging-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver updates from Greg KH: "Here is the large set of staging driver changes for 6.1-rc1. Nothing really interesting in here at all except we deleted a driver (fwserial) as no one had been using it for a long time. Other than that, just the normal cleanups and minor fixes: - rtl8723bs driver cleanups - loads of r8188eu driver cleanups, making the driver smaller and fixing up some firmware dependency issues. - vt6655 driver cleanups. - lots of other small staging driver cleanups. All of these have been in linux-next for a while with no reported issues" * tag 'staging-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (266 commits) staging: rtl8192e: Rename variable Bandwidth to avoid CamelCase staging: r8188eu: remove PHY_RFConfig8188E() staging: r8188eu: remove PHY_RF6052_Config8188E() staging: r8188eu: convert ODM_ReadAndConfig_AGC_TAB_1T_8188E() to int staging: r8188eu: convert ODM_ReadAndConfig_PHY_REG_1T_8188E() to int staging: r8188eu: convert ODM_ReadAndConfig_RadioA_1T_8188E() to int staging: r8188eu: convert ODM_ReadAndConfig_MAC_REG_8188E() to int staging: rtl8192e: cmdpkt: Use skb_put_data() instead of skb_put/memcpy pair staging: r8188eu: Use skb_put_data() instead of skb_put/memcpy pair staging: r8188eu: remove hal/odm_RegConfig8188E.c staging: r8188eu: make odm_ConfigRF_RadioA_8188E() static staging: r8188eu: make odm_ConfigMAC_8188E() static staging: r8188eu: don't check for stop/removal in the blink worker staging: r8188eu: don't check bSurpriseRemoved in SwLedOff staging: rtl8192e: Remove unused variables ForcedAMSDUMaxSize, ... staging: rtl8192e: Rename CurrentMPDU..., ForcedAMPDU... and ForcedMPDU... staging: rtl8192e: Rename SelfMimoPs, CurrentOpMode and bForcedShortGI staging: rtl8192e: Rename PeerMimoPs, IOTAction and IOTRaFunc staging: rtl8192e: Rename RxRe...WinSize, RxReorder... and RxReorderDr... staging: rtl8192e: Rename szRT2RTAggBuffer, bRegRxRe... and bCurRxReo... ...
2 parents a094766 + 4256e50 commit 3002b7a

File tree

152 files changed

+2149
-8161
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+2149
-8161
lines changed

drivers/staging/Kconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ source "drivers/staging/board/Kconfig"
6060

6161
source "drivers/staging/gdm724x/Kconfig"
6262

63-
source "drivers/staging/fwserial/Kconfig"
64-
6563
source "drivers/staging/clocking-wizard/Kconfig"
6664

6765
source "drivers/staging/fbtft/Kconfig"

drivers/staging/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ obj-$(CONFIG_USB_EMXX) += emxx_udc/
2020
obj-$(CONFIG_MFD_NVEC) += nvec/
2121
obj-$(CONFIG_STAGING_BOARD) += board/
2222
obj-$(CONFIG_LTE_GDM724X) += gdm724x/
23-
obj-$(CONFIG_FIREWIRE_SERIAL) += fwserial/
2423
obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD) += clocking-wizard/
2524
obj-$(CONFIG_FB_TFT) += fbtft/
2625
obj-$(CONFIG_MOST) += most/

drivers/staging/fwserial/Kconfig

Lines changed: 0 additions & 32 deletions
This file was deleted.

drivers/staging/fwserial/Makefile

Lines changed: 0 additions & 3 deletions
This file was deleted.

drivers/staging/fwserial/TODO

Lines changed: 0 additions & 14 deletions
This file was deleted.

drivers/staging/fwserial/dma_fifo.c

Lines changed: 0 additions & 294 deletions
This file was deleted.

0 commit comments

Comments
 (0)