package/kernel/ep80579-drivers/patches/300-wdt_compile_fix.patch

   1 --- a/Embedded/src/WDT/iwdt.c
   2 +++ b/Embedded/src/WDT/iwdt.c
   3 @@ -180,19 +180,19 @@ MODULE_PARM_DESC(wdt_scale, "Intel WDT s
   4  module_param(wdt_intr_type, byte, WDT_INT_TYPE_IRQ);
   5  MODULE_PARM_DESC(wdt_intr_type, "Intel WDT interrupt type (default SERIRQ).");
   6
   7 -module_param(wdt_margin1, uint, TIMER_MARGIN);
   8 +module_param(wdt_margin1, uint, 0);
   9  MODULE_PARM_DESC(wdt_margin1, "First stage Intel WDT timeout in steps of 1 ms by default.");
  10
  11 -module_param(wdt_margin2, uint, TIMER_MARGIN);
  12 +module_param(wdt_margin2, uint, 0);
  13  MODULE_PARM_DESC(wdt_margin2, "Second stage Intel WDT timeout in steps of 1 ms by default.");
  14
  15  module_param(nowayout, int, 0);
  16  MODULE_PARM_DESC(nowayout, "Intel WDT can't be stopped once started (default=0)");
  17
  18 -module_param(wdt_index_port, int, 0x4E);
  19 +module_param(wdt_index_port, int, 0);
  20  MODULE_PARM_DESC(wdt_index_port, "WDT Index Port (default 0x4e)");
  21
  22 -module_param(wdt_data_port, int, 0x4E);
  23 +module_param(wdt_data_port, int, 0);
  24  MODULE_PARM_DESC(wdt_data_port, "WDT Data Port (default 0x4f)");
  25
  26  static int wdt_get_iobase(struct pci_dev *dev, u16 *iobase, int *irq);
  27 @@ -218,7 +218,7 @@ static ssize_t wdt_write(struct file *fi
  28                       size_t count, loff_t * pos);
  29  static int wdt_ioctl(struct inode *inode, struct file *file,
  30                      unsigned int cmd, unsigned long arg);
  31 -static irqreturn_t wdt_isr(int irq, void *dev_id, struct pt_regs *regs);
  32 +static irqreturn_t wdt_isr(int irq, void *dev_id);
  33  static void __exit wdt_cleanup(void);
  34  static int __init wdt_init(void);
  35  static int __init wdt_init_one(struct pci_dev *dev,
  36 @@ -255,7 +255,7 @@ static struct pci_driver wdt_driver = {
  37       name:        "iwdt",
  38       id_table:     lpc_pci_tbl,
  39       probe:        wdt_init_one,
  40 -     remove:        __devexit(wdt_remove_one),
  41 +     remove:        __devexit_p(wdt_remove_one),
  42       suspend:      wdt_pci_suspend,
  43       resume:       wdt_pci_resume,
  44  };
  45 @@ -1393,12 +1393,12 @@ static int wdt_ioctl(struct inode *inode
  46
  47  /*
  48   * Function Name:   wdt_isr()
  49 - * Parameter:    int irq - irq number, void *dev_id, struct pt_regs *regs
  50 + * Parameter:    int irq - irq number, void *dev_id
  51   * Return Value::   IRQ_NONE -  if the interrupt is not for wdt.
  52   *           IRQ_HANDLED - if it is for wdt.
  53   * Description:     This is the interrupt service routine of the WDT.
  54   */
  55 -static irqreturn_t wdt_isr(int irq, void *dev_id, struct pt_regs *regs)
  56 +static irqreturn_t wdt_isr(int irq, void *dev_id)
  57  {
  58       u8 val;
  59