2.6.0-t3.c99.arch.mips-lkml.patch

   1 diff -aur linux.backup/arch/mips/au1000/common/dma.c linux/arch/mips/au1000/common/dma.c
   2 --- linux.backup/arch/mips/au1000/common/dma.c  Mon Jul 21 23:34:51 2003
   3 +++ linux/arch/mips/au1000/common/dma.c Sat Aug 16 17:59:18 2003
   4 @@ -62,14 +62,14 @@
   5  spinlock_t au1000_dma_spin_lock = SPIN_LOCK_UNLOCKED;
   6
   7  struct dma_chan au1000_dma_table[NUM_AU1000_DMA_CHANNELS] = {
   8 -      {dev_id:-1,},
   9 -      {dev_id:-1,},
  10 -      {dev_id:-1,},
  11 -      {dev_id:-1,},
  12 -      {dev_id:-1,},
  13 -      {dev_id:-1,},
  14 -      {dev_id:-1,},
  15 -      {dev_id:-1,}
  16 +      {.dev_id = -1,},
  17 +      {.dev_id = -1,},
  18 +      {.dev_id = -1,},
  19 +      {.dev_id = -1,},
  20 +      {.dev_id = -1,},
  21 +      {.dev_id = -1,},
  22 +      {.dev_id = -1,},
  23 +      {.dev_id = -1,}
  24  };
  25
  26  // Device FIFO addresses and default DMA modes
  27 diff -aur linux.backup/arch/mips/sibyte/cfe/console.c linux/arch/mips/sibyte/cfe/console.c
  28 --- linux.backup/arch/mips/sibyte/cfe/console.c Sat Aug 16 15:02:40 2003
  29 +++ linux/arch/mips/sibyte/cfe/console.c        Sat Aug 16 15:44:59 2003
  30 @@ -74,12 +74,12 @@
  31  }
  32
  33  static struct console sb1250_cfe_cons = {
  34 -       name:           "cfe",
  35 -       write:          cfe_console_write,
  36 -       device:         cfe_console_device,
  37 -       setup:          cfe_console_setup,
  38 -       flags:          CON_PRINTBUFFER,
  39 -       index:          -1,
  40 +       .name           = "cfe",
  41 +       .write          = cfe_console_write,
  42 +       .device         = cfe_console_device,
  43 +       .setup          = cfe_console_setup,
  44 +       .flags          = CON_PRINTBUFFER,
  45 +       .index          = -1,
  46  };
  47
  48  static int __init sb1250_cfe_console_init(void)
  49 diff -aur linux.backup/arch/mips/tx4927/common/tx4927_irq.c linux/arch/mips/tx4927/common/tx4927_irq.c
  50 --- linux.backup/arch/mips/tx4927/common/tx4927_irq.c   Mon Jul 21 23:34:53 2003
  51 +++ linux/arch/mips/tx4927/common/tx4927_irq.c  Sat Aug 16 17:59:57 2003
  52 @@ -149,26 +149,26 @@
  53
  54  #define TX4927_CP0_NAME "TX4927-CP0"
  55  static struct hw_interrupt_type tx4927_irq_cp0_type = {
  56 -       typename:       TX4927_CP0_NAME,
  57 -       startup:        tx4927_irq_cp0_startup,
  58 -       shutdown:       tx4927_irq_cp0_shutdown,
  59 -       enable:         tx4927_irq_cp0_enable,
  60 -       disable:        tx4927_irq_cp0_disable,
  61 -       ack:            tx4927_irq_cp0_mask_and_ack,
  62 -       end:            tx4927_irq_cp0_end,
  63 -       set_affinity:   NULL
  64 +       .typename       = TX4927_CP0_NAME,
  65 +       .startup        = tx4927_irq_cp0_startup,
  66 +       .shutdown       = tx4927_irq_cp0_shutdown,
  67 +       .enable         = tx4927_irq_cp0_enable,
  68 +       .disable        = tx4927_irq_cp0_disable,
  69 +       .ack            = tx4927_irq_cp0_mask_and_ack,
  70 +       .end            = tx4927_irq_cp0_end,
  71 +       .set_affinity   = NULL
  72  };
  73
  74  #define TX4927_PIC_NAME "TX4927-PIC"
  75  static struct hw_interrupt_type tx4927_irq_pic_type = {
  76 -       typename:       TX4927_PIC_NAME,
  77 -       startup:        tx4927_irq_pic_startup,
  78 -       shutdown:       tx4927_irq_pic_shutdown,
  79 -       enable:         tx4927_irq_pic_enable,
  80 -       disable:        tx4927_irq_pic_disable,
  81 -       ack:            tx4927_irq_pic_mask_and_ack,
  82 -       end:            tx4927_irq_pic_end,
  83 -       set_affinity:   NULL
  84 +       .typename       = TX4927_PIC_NAME,
  85 +       .startup        = tx4927_irq_pic_startup,
  86 +       .shutdown       = tx4927_irq_pic_shutdown,
  87 +       .enable         = tx4927_irq_pic_enable,
  88 +       .disable        = tx4927_irq_pic_disable,
  89 +       .ack            = tx4927_irq_pic_mask_and_ack,
  90 +       .end            = tx4927_irq_pic_end,
  91 +       .set_affinity   = NULL
  92  };
  93
  94  #define TX4927_PIC_ACTION(s) { no_action, 0, 0, s, NULL, NULL }
  95 diff -aur linux.backup/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c linux/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
  96 --- linux.backup/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c       Sat Aug 16 15:02:17 2003
  97 +++ linux/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c      Sat Aug 16 18:02:56 2003
  98 @@ -255,14 +255,14 @@
  99
 100  #define TOSHIBA_RBTX4927_IOC_NAME "RBTX4927-IOC"
 101  static struct hw_interrupt_type toshiba_rbtx4927_irq_ioc_type = {
 102 -       typename:TOSHIBA_RBTX4927_IOC_NAME,
 103 -       startup:toshiba_rbtx4927_irq_ioc_startup,
 104 -       shutdown:toshiba_rbtx4927_irq_ioc_shutdown,
 105 -       enable:toshiba_rbtx4927_irq_ioc_enable,
 106 -       disable:toshiba_rbtx4927_irq_ioc_disable,
 107 -       ack:toshiba_rbtx4927_irq_ioc_mask_and_ack,
 108 -       end:toshiba_rbtx4927_irq_ioc_end,
 109 -       set_affinity:NULL
 110 +       .typename = TOSHIBA_RBTX4927_IOC_NAME,
 111 +       .startup = toshiba_rbtx4927_irq_ioc_startup,
 112 +       .shutdown = toshiba_rbtx4927_irq_ioc_shutdown,
 113 +       .enable = toshiba_rbtx4927_irq_ioc_enable,
 114 +       .disable = toshiba_rbtx4927_irq_ioc_disable,
 115 +       .ack = toshiba_rbtx4927_irq_ioc_mask_and_ack,
 116 +       .end = toshiba_rbtx4927_irq_ioc_end,
 117 +       .set_affinity = NULL
 118  };
 119  #define TOSHIBA_RBTX4927_IOC_INTR_ENAB 0xbc002000
 120  #define TOSHIBA_RBTX4927_IOC_INTR_STAT 0xbc002006
 121 @@ -271,14 +271,14 @@
 122  #ifdef CONFIG_TOSHIBA_FPCIB0
 123  #define TOSHIBA_RBTX4927_ISA_NAME "RBTX4927-ISA"
 124  static struct hw_interrupt_type toshiba_rbtx4927_irq_isa_type = {
 125 -       typename:TOSHIBA_RBTX4927_ISA_NAME,
 126 -       startup:toshiba_rbtx4927_irq_isa_startup,
 127 -       shutdown:toshiba_rbtx4927_irq_isa_shutdown,
 128 -       enable:toshiba_rbtx4927_irq_isa_enable,
 129 -       disable:toshiba_rbtx4927_irq_isa_disable,
 130 -       ack:toshiba_rbtx4927_irq_isa_mask_and_ack,
 131 -       end:toshiba_rbtx4927_irq_isa_end,
 132 -       set_affinity:NULL
 133 +       .typename = TOSHIBA_RBTX4927_ISA_NAME,
 134 +       .startup = toshiba_rbtx4927_irq_isa_startup,
 135 +       .shutdown = toshiba_rbtx4927_irq_isa_shutdown,
 136 +       .enable = toshiba_rbtx4927_irq_isa_enable,
 137 +       .disable = toshiba_rbtx4927_irq_isa_disable,
 138 +       .ack = toshiba_rbtx4927_irq_isa_mask_and_ack,
 139 +       .end = toshiba_rbtx4927_irq_isa_end,
 140 +       .set_affinity = NULL
 141  };
 142  #endif
 143
 144 diff -aur linux.backup/arch/mips/vr41xx/common/vrc4173.c linux/arch/mips/vr41xx/common/vrc4173.c
 145 --- linux.backup/arch/mips/vr41xx/common/vrc4173.c      Sat Aug 16 15:02:40 2003
 146 +++ linux/arch/mips/vr41xx/common/vrc4173.c     Sat Aug 16 18:03:18 2003
 147 @@ -250,10 +250,10 @@
 148  }
 149
 150  static struct pci_driver vrc4173_driver = {
 151 -       name:           "NEC VRC4173",
 152 -       probe:          vrc4173_probe,
 153 -       remove:         NULL,
 154 -       id_table:       vrc4173_table,
 155 +       .name           = "NEC VRC4173",
 156 +       .probe          = vrc4173_probe,
 157 +       .remove         = NULL,
 158 +       .id_table       = vrc4173_table,
 159  };
 160
 161  static int __devinit vrc4173_init(void)