summaryrefslogtreecommitdiffstats
path: root/include/linux/i2c-pnx.h
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-09-21 13:48:01 -0700
committerTony Lindgren <tony@atomide.com>2012-09-21 13:48:01 -0700
commit0c9de3c52d2baed6bc2ee44885adb418152c71c4 (patch)
treee19ab2c41ae47250fd614418022b32aa783aa563 /include/linux/i2c-pnx.h
parent6bfc82ff589a00e5fbc12b958c649d703d273c86 (diff)
parent3c7c5dab44d6c8861bc86dab924353d8d40344f8 (diff)
Merge branch 'for_3.7/omap5_arch_timer' of git://github.com/SantoshShilimkar/linux into devel-dt-arch-timer
Conflicts: arch/arm/mach-omap2/timer.c
Diffstat (limited to 'include/linux/i2c-pnx.h')
-rw-r--r--include/linux/i2c-pnx.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/i2c-pnx.h b/include/linux/i2c-pnx.h
index 1bc74afe7a3..49ed17fdf05 100644
--- a/include/linux/i2c-pnx.h
+++ b/include/linux/i2c-pnx.h
@@ -22,6 +22,7 @@ struct i2c_pnx_mif {
struct timer_list timer; /* Timeout */
u8 * buf; /* Data buffer */
int len; /* Length of data buffer */
+ int order; /* RX Bytes to order via TX */
};
struct i2c_pnx_algo_data {