diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 00:08:59 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 00:08:59 +0400 |
| commit | 21a2cb565a74bf794d343ce22300c5f6c1568ae1 (patch) | |
| tree | 5cf49d94bc8cc31a299417b8a362f0645b41c543 /drivers/misc/ad525x_dpot.h | |
| parent | c99516ca854770000c277b2680a15581c691e18c (diff) | |
| parent | 2a5ac6f7a9c0a24adcf68e0dd634afbe083191c1 (diff) | |
| download | linux-21a2cb565a74bf794d343ce22300c5f6c1568ae1.tar.xz | |
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 { const struct ad_dpot_bus_ops *bops; }; -struct ad_dpot_id { - char *name; - unsigned long devid; -}; - -int ad_dpot_probe(struct device *dev, struct ad_dpot_bus_data *bdata, const struct ad_dpot_id *id); +int ad_dpot_probe(struct device *dev, struct ad_dpot_bus_data *bdata, + unsigned long devid, const char *name); int ad_dpot_remove(struct device *dev); #endif |