Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

[linux-2.6] / drivers / serial / jsm / jsm.h

diff --git a/drivers/serial/jsm/jsm.h b/drivers/serial/jsm/jsm.h
index 043f50b1d10c73934edc9b749bb834c199087839..8871aaa3dba677350f519280a5d75b8ff915316d 100644 (file)
--- a/drivers/serial/jsm/jsm.h
+++ b/drivers/serial/jsm/jsm.h
@@ -99,7 +99,7 @@ struct jsm_channel;
  * Per board operations structure                                      *
  ************************************************************************/
 struct board_ops {
-       irqreturn_t (*intr) (int irq, void *voidbrd, struct pt_regs *regs);
+       irq_handler_t intr;
        void (*uart_init) (struct jsm_channel *ch);
        void (*uart_off) (struct jsm_channel *ch);
        void (*param) (struct jsm_channel *ch);
@@ -373,6 +373,7 @@ struct neo_uart_struct {
 #define PCI_DEVICE_NEO_2DB9PRI_PCI_NAME                "Neo 2 - DB9 Universal PCI - Powered Ring Indicator"
 #define PCI_DEVICE_NEO_2RJ45_PCI_NAME          "Neo 2 - RJ45 Universal PCI"
 #define PCI_DEVICE_NEO_2RJ45PRI_PCI_NAME       "Neo 2 - RJ45 Universal PCI - Powered Ring Indicator"
+#define PCIE_DEVICE_NEO_IBM_PCI_NAME           "Neo 4 - PCI Express - IBM"
 
 /*
  * Our Global Variables.