Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[linux-2.6-omap-h63xx.git] / drivers / staging / echo / echo.h

diff --git a/drivers/staging/echo/echo.h b/drivers/staging/echo/echo.h
index 5c8b5153b199587115c990be870eb8f100729511..9fb9543c4f13a2de76d37f2390f8b161f67dadc9 100644 (file)
--- a/drivers/staging/echo/echo.h
+++ b/drivers/staging/echo/echo.h
@@ -124,9 +124,8 @@ a minor burden.
     G.168 echo canceller descriptor. This defines the working state for a line
     echo canceller.
 */
-struct echo_can_state
-{
-       int16_t tx,rx;
+struct oslec_state {
+       int16_t tx, rx;
        int16_t clean;
        int16_t clean_nlp;
 
@@ -170,4 +169,4 @@ struct echo_can_state
        int16_t *snapshot;
 };
 
-#endif /* __ECHO_H */
+#endif /* __ECHO_H */