summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-09-15 04:55:57 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-09-15 04:55:57 +0400
commit5b799dde3159284fdee8d60f535e2753a86dbb3f (patch)
tree636a679344e014cfda8e9f98be026057c2baba26 /include
parent1547cb80db5587c465be609b9a15bfb2dfd73099 (diff)
parent5f71a3ef3753ac2068009637eee619e163f44b30 (diff)
downloadlinux-5b799dde3159284fdee8d60f535e2753a86dbb3f.tar.xz
Merge branch 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux
Pull i2c embedded fixes from Wolfram Sang: "The last bunch of (typical) i2c-embedded driver fixes for 3.6. Also update the MAINTAINERS file to point to my tree since people keep asking where to find their patches." * 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux: i2c: algo: pca: Fix mode selection for PCA9665 MAINTAINERS: fix tree for current i2c-embedded development i2c: mxs: correctly setup speed for non devicetree i2c: pnx: Fix read transactions of >= 2 bytes i2c: pnx: Fix bit definitions
Diffstat (limited to 'include')
-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 1bc74afe7a35..49ed17fdf055 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 {