Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[~andy/linux] / drivers / staging / vt6656 / rxtx.h

diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h
index f90de42d7abef545837ac90e0ca44998ee9bde1e..f99acf1d8eb9cf10f53d9754d38b66590ace87aa 100644 (file)
--- a/drivers/staging/vt6656/rxtx.h
+++ b/drivers/staging/vt6656/rxtx.h
@@ -683,9 +683,9 @@ bPacketToWirelessUsb(
     );
 
 void vDMA0_tx_80211(PSDevice  pDevice, struct sk_buff *skb);
-NTSTATUS nsDMA_tx_packet(PSDevice  pDevice,
-                        unsigned int uDMAIdx,
-                        struct sk_buff *skb);
+int nsDMA_tx_packet(PSDevice pDevice,
+                   unsigned int uDMAIdx,
+                   struct sk_buff *skb);
 CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket);
 CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket);
 BOOL bRelayPacketSend(PSDevice pDevice, PBYTE pbySkbData,