Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / include / linux / ioc4.h

diff --git a/include/linux/ioc4.h b/include/linux/ioc4.h
index 3dd18b7..de73a32 100644 (file)
--- a/include/linux/ioc4.h
+++ b/include/linux/ioc4.h
@@ -147,6 +147,10 @@ struct ioc4_misc_regs {
 #define IOC4_GPCR_EDGE_6 0x40
 #define IOC4_GPCR_EDGE_7 0x80
 
+#define IOC4_VARIANT_IO9       0x0900
+#define IOC4_VARIANT_PCI_RT    0x0901
+#define IOC4_VARIANT_IO10      0x1000
+
 /* One of these per IOC4 */
 struct ioc4_driver_data {
        struct list_head idd_list;
@@ -156,6 +160,7 @@ struct ioc4_driver_data {
        struct __iomem ioc4_misc_regs *idd_misc_regs;
        unsigned long count_period;
        void *idd_serial_data;
+       unsigned int idd_variant;
 };
 
 /* One per submodule */