diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-08-08 16:21:02 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-08-08 16:21:02 -0400 |
| commit | e4ddcb0a6bf04d53ce77b4eb87bbbb32c4261d11 (patch) | |
| tree | d27d2fea50a384d97aa2d0cf5c8657c916f761d4 /include/linux/maple.h | |
| parent | f2afa7711f8585ffc088ba538b9a510e0d5dca12 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge commit 'v2.6.27-rc1' into for-linus
Diffstat (limited to 'include/linux/maple.h')
| -rw-r--r-- | include/linux/maple.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/maple.h b/include/linux/maple.h index d31e36ebb436..523a286bb477 100644 --- a/include/linux/maple.h +++ b/include/linux/maple.h | |||
| @@ -61,8 +61,6 @@ struct maple_device { | |||
| 61 | 61 | ||
| 62 | struct maple_driver { | 62 | struct maple_driver { |
| 63 | unsigned long function; | 63 | unsigned long function; |
| 64 | int (*connect) (struct maple_device * dev); | ||
| 65 | void (*disconnect) (struct maple_device * dev); | ||
| 66 | struct device_driver drv; | 64 | struct device_driver drv; |
| 67 | }; | 65 | }; |
| 68 | 66 | ||