Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[cascardo/linux.git] / drivers / staging / csr / csr_wifi_hip_signals.h

diff --git a/drivers/staging/csr/csr_wifi_hip_signals.h b/drivers/staging/csr/csr_wifi_hip_signals.h
index c48fddd..5f84155 100644 (file)
--- a/drivers/staging/csr/csr_wifi_hip_signals.h
+++ b/drivers/staging/csr/csr_wifi_hip_signals.h
@@ -24,7 +24,7 @@
 #ifndef __CSR_WIFI_HIP_SIGNALS_H__
 #define __CSR_WIFI_HIP_SIGNALS_H__
 
-#include "csr_types.h"
+#include <linux/types.h>
 #include "csr_wifi_hip_sigs.h"
 
 
@@ -116,7 +116,7 @@ extern "C" {
  * RETURNS:
  *   The number of data-refs in the signal.
  */
-CsrInt32 SigGetDataRefs(CSR_SIGNAL *aSignal, CSR_DATAREF **aDataRef);
+s32 SigGetDataRefs(CSR_SIGNAL *aSignal, CSR_DATAREF **aDataRef);
 
 /******************************************************************************
  * SigGetSize - Retrieve the size (in bytes) of a given signal.
@@ -127,7 +127,7 @@ CsrInt32 SigGetDataRefs(CSR_SIGNAL *aSignal, CSR_DATAREF **aDataRef);
  * RETURNS:
  *   The size (in bytes) of the given signal.
  */
-CsrInt32 SigGetSize(const CSR_SIGNAL *aSignal);
+s32 SigGetSize(const CSR_SIGNAL *aSignal);
 
 #ifdef __cplusplus
 }