diff options
author | Jiri Kosina <jkosina@suse.cz> | 2010-06-16 12:08:13 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-06-16 12:08:13 -0400 |
commit | f1bbbb6912662b9f6070c5bfc4ca9eb1f06a9d5b (patch) | |
tree | c2c130a74be25b0b2dff992e1a195e2728bdaadd /include/linux/i2c/max732x.h | |
parent | fd0961ff67727482bb20ca7e8ea97b83e9de2ddb (diff) | |
parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) |
Merge branch 'master' into for-next
Diffstat (limited to 'include/linux/i2c/max732x.h')
-rw-r--r-- | include/linux/i2c/max732x.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/i2c/max732x.h b/include/linux/i2c/max732x.h index e10336631c62..c04bac8bf2fe 100644 --- a/include/linux/i2c/max732x.h +++ b/include/linux/i2c/max732x.h | |||
@@ -7,6 +7,9 @@ struct max732x_platform_data { | |||
7 | /* number of the first GPIO */ | 7 | /* number of the first GPIO */ |
8 | unsigned gpio_base; | 8 | unsigned gpio_base; |
9 | 9 | ||
10 | /* interrupt base */ | ||
11 | int irq_base; | ||
12 | |||
10 | void *context; /* param to setup/teardown */ | 13 | void *context; /* param to setup/teardown */ |
11 | 14 | ||
12 | int (*setup)(struct i2c_client *client, | 15 | int (*setup)(struct i2c_client *client, |