diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 15:08:59 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 15:08:59 -0500 |
commit | 21a2cb565a74bf794d343ce22300c5f6c1568ae1 (patch) | |
tree | 5cf49d94bc8cc31a299417b8a362f0645b41c543 /drivers/misc/ad525x_dpot.h | |
parent | c99516ca854770000c277b2680a15581c691e18c (diff) | |
parent | 2a5ac6f7a9c0a24adcf68e0dd634afbe083191c1 (diff) |
Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
* 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
isl29020: Remove a redundant semi-colon from return statement
BMP085: Remove redundant semi-colon from return statement
drivers:misc: ti-st: DEBUG uart, baud rate mods
drivers:misc: ti-st: flush UART upon fw failure
drivers:misc: ti-st: protect registrations
char_dev.c: fix up some whitespace errors
s390: tape_class.h: remove kobj_map.h inclusion
misc: ad525x_dpot: Add support for SPI module device table matching
Diffstat (limited to 'drivers/misc/ad525x_dpot.h')
-rw-r--r-- | drivers/misc/ad525x_dpot.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/misc/ad525x_dpot.h b/drivers/misc/ad525x_dpot.h index 82b2cb77ae19..6bd1eba23bc0 100644 --- a/drivers/misc/ad525x_dpot.h +++ b/drivers/misc/ad525x_dpot.h | |||
@@ -208,12 +208,8 @@ struct ad_dpot_bus_data { | |||
208 | const struct ad_dpot_bus_ops *bops; | 208 | const struct ad_dpot_bus_ops *bops; |
209 | }; | 209 | }; |
210 | 210 | ||
211 | struct ad_dpot_id { | 211 | int ad_dpot_probe(struct device *dev, struct ad_dpot_bus_data *bdata, |
212 | char *name; | 212 | unsigned long devid, const char *name); |
213 | unsigned long devid; | ||
214 | }; | ||
215 | |||
216 | int ad_dpot_probe(struct device *dev, struct ad_dpot_bus_data *bdata, const struct ad_dpot_id *id); | ||
217 | int ad_dpot_remove(struct device *dev); | 213 | int ad_dpot_remove(struct device *dev); |
218 | 214 | ||
219 | #endif | 215 | #endif |