--- drivers/i2c/busses/i2c-pnx.c.orig	2012-03-30 09:56:30.405406029 +0200
+++ drivers/i2c/busses/i2c-pnx.c	2012-03-30 09:56:42.143265605 +0200
@@ -176,7 +176,11 @@
 		val = *alg_data->mif.buf++;
 
 		/* last byte of a message */
-		if ((alg_data->mif.len == 1) && alg_data->last)
+		if ((alg_data->mif.len == 1)
+#ifdef STOP_BIT_ONLY_ON_LAST_MSG
+			&& alg_data->last
+#endif
+		   )
 			val |= stop_bit;
 
 		alg_data->mif.len--;