Merge branch 'for-2.6.37' into for-2.6.38

[mv-sheeva.git] / drivers / staging / cx25821 / cx25821-i2c.c

diff --git a/drivers/staging/cx25821/cx25821-i2c.c b/drivers/staging/cx25821/cx25821-i2c.c
index e43572e61eceac239f6e86dbd654a34ea95e5fe2..2b14bcca6897535378a915467950c2e82b409db2 100644 (file)
--- a/drivers/staging/cx25821/cx25821-i2c.c
+++ b/drivers/staging/cx25821/cx25821-i2c.c
@@ -283,7 +283,7 @@ static struct i2c_algorithm cx25821_i2c_algo_template = {
        .master_xfer = i2c_xfer,
        .functionality = cx25821_functionality,
 #ifdef NEED_ALGO_CONTROL
-       .algo_control = dummy_algo_control,
+       .algo_control = dummy_algo_control,
 #endif
 };