diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:32:00 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:32:00 -0400 |
| commit | 9e3ee1c39c0cc71222f9980ccbf87fe072897eef (patch) | |
| tree | 99462000e6f0d4f907cb2fc690f19d4d441ba0f3 /include/linux/maple.h | |
| parent | e56b3bc7942982ac2589c942fb345e38bc7a341a (diff) | |
| parent | f934fb19ef34730263e6afc01e8ec27a8a71470f (diff) | |
Merge branch 'linus' into cpus4096
Conflicts:
kernel/stop_machine.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 d31e36ebb43..523a286bb47 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 | ||