summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2008-10-17 20:56:00 +0300
committerGreg Kroah-Hartman <gregkh@suse.de>2008-10-22 09:56:35 -0700
commit6675fe3f92ad3b433e55744ef96d775b4875997e (patch)
tree18a442789ccfd6338488487e3226356c10b222e3
parentf07639adebd573709ea0d6b67bec9b620fe3083e (diff)
Staging: echo: remove __cplusplus macro magic
The kernel is written in C, so remove the __cplusplus macro magic from the driver. Cc: David Rowe <david@rowetel.com> Cc: Steve Underwood <steveu@coppice.org> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/echo/bit_operations.h8
-rw-r--r--drivers/staging/echo/fir.h8
2 files changed, 0 insertions, 16 deletions
diff --git a/drivers/staging/echo/bit_operations.h b/drivers/staging/echo/bit_operations.h
index b32f4bf99397..04b55d2aba59 100644
--- a/drivers/staging/echo/bit_operations.h
+++ b/drivers/staging/echo/bit_operations.h
@@ -30,10 +30,6 @@
#if !defined(_BIT_OPERATIONS_H_)
#define _BIT_OPERATIONS_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
#if defined(__i386__) || defined(__x86_64__)
/*! \brief Find the bit position of the highest set bit in a word
\param bits The word to be searched
@@ -245,9 +241,5 @@ static __inline__ int parity32(uint32_t x)
}
/*- End of function --------------------------------------------------------*/
-#ifdef __cplusplus
-}
-#endif
-
#endif
/*- End of file ------------------------------------------------------------*/
diff --git a/drivers/staging/echo/fir.h b/drivers/staging/echo/fir.h
index 19c20cde186b..d1df33cf2aa5 100644
--- a/drivers/staging/echo/fir.h
+++ b/drivers/staging/echo/fir.h
@@ -105,10 +105,6 @@ typedef struct
float *history;
} fir_float_state_t;
-#ifdef __cplusplus
-extern "C" {
-#endif
-
static __inline__ const int16_t *fir16_create(fir16_state_t *fir,
const int16_t *coeffs,
int taps)
@@ -312,9 +308,5 @@ static __inline__ int16_t fir32(fir32_state_t *fir, int16_t sample)
}
/*- End of function --------------------------------------------------------*/
-#ifdef __cplusplus
-}
-#endif
-
#endif
/*- End of file ------------------------------------------------------------*/