[PATCH] ACPI: fix cpufreq regression

[safe/jmp/linux-2.6] / include / linux / rio.h

diff --git a/include/linux/rio.h b/include/linux/rio.h
index 5c29f2f..d938570 100644 (file)
--- a/include/linux/rio.h
+++ b/include/linux/rio.h
@@ -17,7 +17,6 @@
 #ifdef __KERNEL__
 
 #include <linux/types.h>
-#include <linux/config.h>
 #include <linux/ioport.h>
 #include <linux/list.h>
 #include <linux/errno.h>
@@ -132,7 +131,7 @@ struct rio_dev {
  */
 struct rio_msg {
        struct resource *res;
-       void (*mcback) (struct rio_mport * mport, int mbox, int slot);
+       void (*mcback) (struct rio_mport * mport, void *dev_id, int mbox, int slot);
 };
 
 /**
@@ -140,11 +139,13 @@ struct rio_msg {
  * @node: Node in list of doorbell events
  * @res: Doorbell resource
  * @dinb: Doorbell event callback
+ * @dev_id: Device specific pointer to pass on event
  */
 struct rio_dbell {
        struct list_head node;
        struct resource *res;
-       void (*dinb) (struct rio_mport * mport, u16 src, u16 dst, u16 info);
+       void (*dinb) (struct rio_mport *mport, void *dev_id, u16 src, u16 dst, u16 info);
+       void *dev_id;
 };
 
 /**
@@ -314,9 +315,9 @@ extern int rio_hw_add_outb_message(struct rio_mport *, struct rio_dev *, int,
                                   void *, size_t);
 extern int rio_hw_add_inb_buffer(struct rio_mport *, int, void *);
 extern void *rio_hw_get_inb_message(struct rio_mport *, int);
-extern int rio_open_inb_mbox(struct rio_mport *, int, int);
+extern int rio_open_inb_mbox(struct rio_mport *, void *, int, int);
 extern void rio_close_inb_mbox(struct rio_mport *, int);
-extern int rio_open_outb_mbox(struct rio_mport *, int, int);
+extern int rio_open_outb_mbox(struct rio_mport *, void *, int, int);
 extern void rio_close_outb_mbox(struct rio_mport *, int);
 
 #endif                         /* __KERNEL__ */