Merge branch 'linus' into x86/xen

[linux-2.6-omap-h63xx.git] / include / linux / maple.h

diff --git a/include/linux/maple.h b/include/linux/maple.h
index d31e36ebb436fd25ec087ac135b5fdbef68ff815..523a286bb477d1d6ab1020140aa4390a5b568571 100644 (file)
--- a/include/linux/maple.h
+++ b/include/linux/maple.h
@@ -61,8 +61,6 @@ struct maple_device {
 
 struct maple_driver {
        unsigned long function;
-       int (*connect) (struct maple_device * dev);
-       void (*disconnect) (struct maple_device * dev);
        struct device_driver drv;
 };