From d9dfbbaca2945af791cc1e1ce5f1fb89492ca08b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 28 Apr 2003 10:26:59 -0700 Subject: driver core: fix up the pcmcia code to work with the new class changes. This isn't the optimal fix, but things still work properly for me with my hardware and this patch. Dominik Brodowski has stated he will be fixing up this code a lot more after the class changes are in the main tree. --- include/pcmcia/ss.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h index 2867812ad492..2a3917ce1814 100644 --- a/include/pcmcia/ss.h +++ b/include/pcmcia/ss.h @@ -148,12 +148,13 @@ struct pcmcia_socket_class_data { * returned to driver) = sock_offset + (0, 1, .. , (nsock-1) */ struct pccard_operations *ops; /* see above */ void *s_info; /* socket_info_t */ + struct class_device class_dev; /* generic class structure */ }; -extern struct device_class pcmcia_socket_class; +extern struct class pcmcia_socket_class; /* socket drivers are expected to use these callbacks in their .drv struct */ -int pcmcia_socket_dev_suspend(struct device * dev, u32 state, u32 level); -int pcmcia_socket_dev_resume(struct device * dev, u32 level); +extern int pcmcia_socket_dev_suspend(struct pcmcia_socket_class_data *cls_d, u32 state, u32 level); +extern int pcmcia_socket_dev_resume(struct pcmcia_socket_class_data *cls_d, u32 level); #endif /* _LINUX_SS_H */ -- cgit v1.2.3