Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6

[pandora-kernel.git] / include / linux / rio.h

diff --git a/include/linux/rio.h b/include/linux/rio.h
index 4a064bc..dc0c755 100644 (file)
--- a/include/linux/rio.h
+++ b/include/linux/rio.h
@@ -14,8 +14,6 @@
 #ifndef LINUX_RIO_H
 #define LINUX_RIO_H
 
-#ifdef __KERNEL__
-
 #include <linux/types.h>
 #include <linux/ioport.h>
 #include <linux/list.h>
@@ -145,6 +143,11 @@ struct rio_dbell {
        void *dev_id;
 };
 
+enum rio_phy_type {
+       RIO_PHY_PARALLEL,
+       RIO_PHY_SERIAL,
+};
+
 /**
  * struct rio_mport - RIO master port info
  * @dbells: List of doorbell events
@@ -158,6 +161,8 @@ struct rio_dbell {
  * @ops: configuration space functions
  * @id: Port ID, unique among all ports
  * @index: Port index, unique among all port interfaces of the same type
+ * @sys_size: RapidIO common transport system size
+ * @phy_type: RapidIO phy type
  * @name: Port name string
  * @priv: Master port private data
  */
@@ -178,6 +183,7 @@ struct rio_mport {
                                 * 0 - Small size. 256 devices.
                                 * 1 - Large size, 65536 devices.
                                 */
+       enum rio_phy_type phy_type;     /* RapidIO phy type */
        unsigned char name[40];
        void *priv;             /* Master port private data */
 };
@@ -325,5 +331,4 @@ extern void rio_close_inb_mbox(struct rio_mport *, 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__ */
 #endif                         /* LINUX_RIO_H */