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

   1 diff -aur linux.backup/arch/sh/boards/adx/mach.c linux/arch/sh/boards/adx/mach.c
   2 --- linux.backup/arch/sh/boards/adx/mach.c      Mon Jul 21 23:34:54 2003
   3 +++ linux/arch/sh/boards/adx/mach.c     Sat Aug 16 15:45:00 2003
   4 @@ -24,41 +24,41 @@
   5   */
   6
   7  struct sh_machine_vector mv_adx __initmv = {
   8 -       mv_nr_irqs:             48,
   9 +       .mv_nr_irqs             = 48,
  10
  11 -       mv_inb:                 adx_inb,
  12 -       mv_inw:                 adx_inw,
  13 -       mv_inl:                 adx_inl,
  14 -       mv_outb:                adx_outb,
  15 -       mv_outw:                adx_outw,
  16 -       mv_outl:                adx_outl,
  17 -
  18 -       mv_inb_p:               adx_inb_p,
  19 -       mv_inw_p:               adx_inw,
  20 -       mv_inl_p:               adx_inl,
  21 -       mv_outb_p:              adx_outb_p,
  22 -       mv_outw_p:              adx_outw,
  23 -       mv_outl_p:              adx_outl,
  24 -
  25 -       mv_insb:                adx_insb,
  26 -       mv_insw:                adx_insw,
  27 -       mv_insl:                adx_insl,
  28 -       mv_outsb:               adx_outsb,
  29 -       mv_outsw:               adx_outsw,
  30 -       mv_outsl:               adx_outsl,
  31 -
  32 -       mv_readb:               adx_readb,
  33 -       mv_readw:               adx_readw,
  34 -       mv_readl:               adx_readl,
  35 -       mv_writeb:              adx_writeb,
  36 -       mv_writew:              adx_writew,
  37 -       mv_writel:              adx_writel,
  38 +       .mv_inb                 = adx_inb,
  39 +       .mv_inw                 = adx_inw,
  40 +       .mv_inl                 = adx_inl,
  41 +       .mv_outb                = adx_outb,
  42 +       .mv_outw                = adx_outw,
  43 +       .mv_outl                = adx_outl,
  44 +
  45 +       .mv_inb_p               = adx_inb_p,
  46 +       .mv_inw_p               = adx_inw,
  47 +       .mv_inl_p               = adx_inl,
  48 +       .mv_outb_p              = adx_outb_p,
  49 +       .mv_outw_p              = adx_outw,
  50 +       .mv_outl_p              = adx_outl,
  51 +
  52 +       .mv_insb                = adx_insb,
  53 +       .mv_insw                = adx_insw,
  54 +       .mv_insl                = adx_insl,
  55 +       .mv_outsb               = adx_outsb,
  56 +       .mv_outsw               = adx_outsw,
  57 +       .mv_outsl               = adx_outsl,
  58 +
  59 +       .mv_readb               = adx_readb,
  60 +       .mv_readw               = adx_readw,
  61 +       .mv_readl               = adx_readl,
  62 +       .mv_writeb              = adx_writeb,
  63 +       .mv_writew              = adx_writew,
  64 +       .mv_writel              = adx_writel,
  65
  66 -       mv_ioremap:             adx_ioremap,
  67 -       mv_iounmap:             adx_iounmap,
  68 +       .mv_ioremap             = adx_ioremap,
  69 +       .mv_iounmap             = adx_iounmap,
  70
  71 -       mv_isa_port2addr:       adx_isa_port2addr,
  72 +       .mv_isa_port2addr       = adx_isa_port2addr,
  73
  74 -       mv_init_irq:            init_adx_IRQ,
  75 +       .mv_init_irq            = init_adx_IRQ,
  76  };
  77  ALIAS_MV(adx)
  78 diff -aur linux.backup/arch/sh/boards/bigsur/mach.c linux/arch/sh/boards/bigsur/mach.c
  79 --- linux.backup/arch/sh/boards/bigsur/mach.c   Thu Jun 26 23:47:25 2003
  80 +++ linux/arch/sh/boards/bigsur/mach.c  Sat Aug 16 18:11:31 2003
  81 @@ -28,44 +28,44 @@
  82  extern void init_bigsur_IRQ(void);
  83
  84  struct sh_machine_vector mv_bigsur __initmv = {
  85 -       mv_nr_irqs:             NR_IRQS,     // Defined in <asm/irq.h>
  86 -       mv_inb:                 bigsur_inb,
  87 -       mv_inw:                 bigsur_inw,
  88 -       mv_inl:                 bigsur_inl,
  89 -       mv_outb:                bigsur_outb,
  90 -       mv_outw:                bigsur_outw,
  91 -       mv_outl:                bigsur_outl,
  92 -
  93 -       mv_inb_p:               bigsur_inb_p,
  94 -       mv_inw_p:               bigsur_inw,
  95 -       mv_inl_p:               bigsur_inl,
  96 -       mv_outb_p:              bigsur_outb_p,
  97 -       mv_outw_p:              bigsur_outw,
  98 -       mv_outl_p:              bigsur_outl,
  99 -
 100 -       mv_insb:                bigsur_insb,
 101 -       mv_insw:                bigsur_insw,
 102 -       mv_insl:                bigsur_insl,
 103 -       mv_outsb:               bigsur_outsb,
 104 -       mv_outsw:               bigsur_outsw,
 105 -       mv_outsl:               bigsur_outsl,
 106 -
 107 -       mv_readb:               generic_readb,
 108 -       mv_readw:               generic_readw,
 109 -       mv_readl:               generic_readl,
 110 -       mv_writeb:              generic_writeb,
 111 -       mv_writew:              generic_writew,
 112 -       mv_writel:              generic_writel,
 113 +       .mv_nr_irqs             = NR_IRQS,     // Defined in <asm/irq.h>
 114 +       .mv_inb                 = bigsur_inb,
 115 +       .mv_inw                 = bigsur_inw,
 116 +       .mv_inl                 = bigsur_inl,
 117 +       .mv_outb                = bigsur_outb,
 118 +       .mv_outw                = bigsur_outw,
 119 +       .mv_outl                = bigsur_outl,
 120 +
 121 +       .mv_inb_p               = bigsur_inb_p,
 122 +       .mv_inw_p               = bigsur_inw,
 123 +       .mv_inl_p               = bigsur_inl,
 124 +       .mv_outb_p              = bigsur_outb_p,
 125 +       .mv_outw_p              = bigsur_outw,
 126 +       .mv_outl_p              = bigsur_outl,
 127 +
 128 +       .mv_insb                = bigsur_insb,
 129 +       .mv_insw                = bigsur_insw,
 130 +       .mv_insl                = bigsur_insl,
 131 +       .mv_outsb               = bigsur_outsb,
 132 +       .mv_outsw               = bigsur_outsw,
 133 +       .mv_outsl               = bigsur_outsl,
 134 +
 135 +       .mv_readb               = generic_readb,
 136 +       .mv_readw               = generic_readw,
 137 +       .mv_readl               = generic_readl,
 138 +       .mv_writeb              = generic_writeb,
 139 +       .mv_writew              = generic_writew,
 140 +       .mv_writel              = generic_writel,
 141
 142 -       mv_ioremap:             generic_ioremap,
 143 -       mv_iounmap:             generic_iounmap,
 144 +       .mv_ioremap             = generic_ioremap,
 145 +       .mv_iounmap             = generic_iounmap,
 146
 147 -       mv_isa_port2addr:       bigsur_isa_port2addr,
 148 -       mv_irq_demux:       bigsur_irq_demux,
 149 +       .mv_isa_port2addr       = bigsur_isa_port2addr,
 150 +       .mv_irq_demux       = bigsur_irq_demux,
 151
 152 -       mv_init_irq:            init_bigsur_IRQ,
 153 +       .mv_init_irq            = init_bigsur_IRQ,
 154  #ifdef CONFIG_HEARTBEAT
 155 -       mv_heartbeat:           heartbeat_bigsur,
 156 +       .mv_heartbeat           = heartbeat_bigsur,
 157  #endif
 158
 159  };
 160 diff -aur linux.backup/arch/sh/boards/cat68701/mach.c linux/arch/sh/boards/cat68701/mach.c
 161 --- linux.backup/arch/sh/boards/cat68701/mach.c Thu Jun 26 23:47:25 2003
 162 +++ linux/arch/sh/boards/cat68701/mach.c        Sat Aug 16 15:45:00 2003
 163 @@ -23,44 +23,44 @@
 164   */
 165
 166  struct sh_machine_vector mv_cat68701 __initmv = {
 167 -       mv_nr_irqs:             32,
 168 -       mv_inb:                 cat68701_inb,
 169 -       mv_inw:                 cat68701_inw,
 170 -       mv_inl:                 cat68701_inl,
 171 -       mv_outb:                cat68701_outb,
 172 -       mv_outw:                cat68701_outw,
 173 -       mv_outl:                cat68701_outl,
 174 -
 175 -       mv_inb_p:               cat68701_inb_p,
 176 -       mv_inw_p:               cat68701_inw,
 177 -       mv_inl_p:               cat68701_inl,
 178 -       mv_outb_p:              cat68701_outb_p,
 179 -       mv_outw_p:              cat68701_outw,
 180 -       mv_outl_p:              cat68701_outl,
 181 -
 182 -       mv_insb:                cat68701_insb,
 183 -       mv_insw:                cat68701_insw,
 184 -       mv_insl:                cat68701_insl,
 185 -       mv_outsb:               cat68701_outsb,
 186 -       mv_outsw:               cat68701_outsw,
 187 -       mv_outsl:               cat68701_outsl,
 188 -
 189 -       mv_readb:               cat68701_readb,
 190 -       mv_readw:               cat68701_readw,
 191 -       mv_readl:               cat68701_readl,
 192 -       mv_writeb:              cat68701_writeb,
 193 -       mv_writew:              cat68701_writew,
 194 -       mv_writel:              cat68701_writel,
 195 +       .mv_nr_irqs             = 32,
 196 +       .mv_inb                 = cat68701_inb,
 197 +       .mv_inw                 = cat68701_inw,
 198 +       .mv_inl                 = cat68701_inl,
 199 +       .mv_outb                = cat68701_outb,
 200 +       .mv_outw                = cat68701_outw,
 201 +       .mv_outl                = cat68701_outl,
 202 +
 203 +       .mv_inb_p               = cat68701_inb_p,
 204 +       .mv_inw_p               = cat68701_inw,
 205 +       .mv_inl_p               = cat68701_inl,
 206 +       .mv_outb_p              = cat68701_outb_p,
 207 +       .mv_outw_p              = cat68701_outw,
 208 +       .mv_outl_p              = cat68701_outl,
 209 +
 210 +       .mv_insb                = cat68701_insb,
 211 +       .mv_insw                = cat68701_insw,
 212 +       .mv_insl                = cat68701_insl,
 213 +       .mv_outsb               = cat68701_outsb,
 214 +       .mv_outsw               = cat68701_outsw,
 215 +       .mv_outsl               = cat68701_outsl,
 216 +
 217 +       .mv_readb               = cat68701_readb,
 218 +       .mv_readw               = cat68701_readw,
 219 +       .mv_readl               = cat68701_readl,
 220 +       .mv_writeb              = cat68701_writeb,
 221 +       .mv_writew              = cat68701_writew,
 222 +       .mv_writel              = cat68701_writel,
 223
 224 -       mv_ioremap:             cat68701_ioremap,
 225 -       mv_iounmap:             cat68701_iounmap,
 226 +       .mv_ioremap             = cat68701_ioremap,
 227 +       .mv_iounmap             = cat68701_iounmap,
 228
 229 -       mv_isa_port2addr:       cat68701_isa_port2addr,
 230 -       mv_irq_demux:           cat68701_irq_demux,
 231 +       .mv_isa_port2addr       = cat68701_isa_port2addr,
 232 +       .mv_irq_demux           = cat68701_irq_demux,
 233
 234 -       mv_init_irq:            init_cat68701_IRQ,
 235 +       .mv_init_irq            = init_cat68701_IRQ,
 236  #ifdef CONFIG_HEARTBEAT
 237 -       mv_heartbeat:           heartbeat_cat68701,
 238 +       .mv_heartbeat           = heartbeat_cat68701,
 239  #endif
 240  };
 241  ALIAS_MV(cat68701)
 242 diff -aur linux.backup/arch/sh/boards/cqreek/mach.c linux/arch/sh/boards/cqreek/mach.c
 243 --- linux.backup/arch/sh/boards/cqreek/mach.c   Thu Jun 26 23:47:25 2003
 244 +++ linux/arch/sh/boards/cqreek/mach.c  Sat Aug 16 15:45:00 2003
 245 @@ -21,46 +21,46 @@
 246
 247  struct sh_machine_vector mv_cqreek __initmv = {
 248  #if defined(CONFIG_CPU_SH4)
 249 -       mv_nr_irqs:             48,
 250 +       .mv_nr_irqs             = 48,
 251  #elif defined(CONFIG_CPU_SUBTYPE_SH7708)
 252 -       mv_nr_irqs:             32,
 253 +       .mv_nr_irqs             = 32,
 254  #elif defined(CONFIG_CPU_SUBTYPE_SH7709)
 255 -       mv_nr_irqs:             61,
 256 +       .mv_nr_irqs             = 61,
 257  #endif
 258
 259 -       mv_inb:                 generic_inb,
 260 -       mv_inw:                 generic_inw,
 261 -       mv_inl:                 generic_inl,
 262 -       mv_outb:                generic_outb,
 263 -       mv_outw:                generic_outw,
 264 -       mv_outl:                generic_outl,
 265 -
 266 -       mv_inb_p:               generic_inb_p,
 267 -       mv_inw_p:               generic_inw_p,
 268 -       mv_inl_p:               generic_inl_p,
 269 -       mv_outb_p:              generic_outb_p,
 270 -       mv_outw_p:              generic_outw_p,
 271 -       mv_outl_p:              generic_outl_p,
 272 -
 273 -       mv_insb:                generic_insb,
 274 -       mv_insw:                generic_insw,
 275 -       mv_insl:                generic_insl,
 276 -       mv_outsb:               generic_outsb,
 277 -       mv_outsw:               generic_outsw,
 278 -       mv_outsl:               generic_outsl,
 279 -
 280 -       mv_readb:               generic_readb,
 281 -       mv_readw:               generic_readw,
 282 -       mv_readl:               generic_readl,
 283 -       mv_writeb:              generic_writeb,
 284 -       mv_writew:              generic_writew,
 285 -       mv_writel:              generic_writel,
 286 +       .mv_inb                 = generic_inb,
 287 +       .mv_inw                 = generic_inw,
 288 +       .mv_inl                 = generic_inl,
 289 +       .mv_outb                = generic_outb,
 290 +       .mv_outw                = generic_outw,
 291 +       .mv_outl                = generic_outl,
 292 +
 293 +       .mv_inb_p               = generic_inb_p,
 294 +       .mv_inw_p               = generic_inw_p,
 295 +       .mv_inl_p               = generic_inl_p,
 296 +       .mv_outb_p              = generic_outb_p,
 297 +       .mv_outw_p              = generic_outw_p,
 298 +       .mv_outl_p              = generic_outl_p,
 299 +
 300 +       .mv_insb                = generic_insb,
 301 +       .mv_insw                = generic_insw,
 302 +       .mv_insl                = generic_insl,
 303 +       .mv_outsb               = generic_outsb,
 304 +       .mv_outsw               = generic_outsw,
 305 +       .mv_outsl               = generic_outsl,
 306 +
 307 +       .mv_readb               = generic_readb,
 308 +       .mv_readw               = generic_readw,
 309 +       .mv_readl               = generic_readl,
 310 +       .mv_writeb              = generic_writeb,
 311 +       .mv_writew              = generic_writew,
 312 +       .mv_writel              = generic_writel,
 313
 314 -       mv_init_irq:            init_cqreek_IRQ,
 315 +       .mv_init_irq            = init_cqreek_IRQ,
 316
 317 -       mv_isa_port2addr:       cqreek_port2addr,
 318 +       .mv_isa_port2addr       = cqreek_port2addr,
 319
 320 -       mv_ioremap:             generic_ioremap,
 321 -       mv_iounmap:             generic_iounmap,
 322 +       .mv_ioremap             = generic_ioremap,
 323 +       .mv_iounmap             = generic_iounmap,
 324  };
 325  ALIAS_MV(cqreek)
 326 diff -aur linux.backup/arch/sh/boards/dmida/mach.c linux/arch/sh/boards/dmida/mach.c
 327 --- linux.backup/arch/sh/boards/dmida/mach.c    Mon Jul 21 23:34:54 2003
 328 +++ linux/arch/sh/boards/dmida/mach.c   Sat Aug 16 15:45:00 2003
 329 @@ -30,42 +30,42 @@
 330   */
 331
 332  struct sh_machine_vector mv_dmida __initmv = {
 333 -       mv_name:                "DMIDA",
 334 +       .mv_name                = "DMIDA",
 335
 336 -       mv_nr_irqs:             HD64465_IRQ_BASE+HD64465_IRQ_NUM,
 337 +       .mv_nr_irqs             = HD64465_IRQ_BASE+HD64465_IRQ_NUM,
 338
 339 -       mv_inb:                 hd64465_inb,
 340 -       mv_inw:                 hd64465_inw,
 341 -       mv_inl:                 hd64465_inl,
 342 -       mv_outb:                hd64465_outb,
 343 -       mv_outw:                hd64465_outw,
 344 -       mv_outl:                hd64465_outl,
 345 -
 346 -       mv_inb_p:               hd64465_inb_p,
 347 -       mv_inw_p:               hd64465_inw,
 348 -       mv_inl_p:               hd64465_inl,
 349 -       mv_outb_p:              hd64465_outb_p,
 350 -       mv_outw_p:              hd64465_outw,
 351 -       mv_outl_p:              hd64465_outl,
 352 -
 353 -       mv_insb:                hd64465_insb,
 354 -       mv_insw:                hd64465_insw,
 355 -       mv_insl:                hd64465_insl,
 356 -       mv_outsb:               hd64465_outsb,
 357 -       mv_outsw:               hd64465_outsw,
 358 -       mv_outsl:               hd64465_outsl,
 359 -
 360 -       mv_readb:               generic_readb,
 361 -       mv_readw:               generic_readw,
 362 -       mv_readl:               generic_readl,
 363 -       mv_writeb:              generic_writeb,
 364 -       mv_writew:              generic_writew,
 365 -       mv_writel:              generic_writel,
 366 +       .mv_inb                 = hd64465_inb,
 367 +       .mv_inw                 = hd64465_inw,
 368 +       .mv_inl                 = hd64465_inl,
 369 +       .mv_outb                = hd64465_outb,
 370 +       .mv_outw                = hd64465_outw,
 371 +       .mv_outl                = hd64465_outl,
 372 +
 373 +       .mv_inb_p               = hd64465_inb_p,
 374 +       .mv_inw_p               = hd64465_inw,
 375 +       .mv_inl_p               = hd64465_inl,
 376 +       .mv_outb_p              = hd64465_outb_p,
 377 +       .mv_outw_p              = hd64465_outw,
 378 +       .mv_outl_p              = hd64465_outl,
 379 +
 380 +       .mv_insb                = hd64465_insb,
 381 +       .mv_insw                = hd64465_insw,
 382 +       .mv_insl                = hd64465_insl,
 383 +       .mv_outsb               = hd64465_outsb,
 384 +       .mv_outsw               = hd64465_outsw,
 385 +       .mv_outsl               = hd64465_outsl,
 386 +
 387 +       .mv_readb               = generic_readb,
 388 +       .mv_readw               = generic_readw,
 389 +       .mv_readl               = generic_readl,
 390 +       .mv_writeb              = generic_writeb,
 391 +       .mv_writew              = generic_writew,
 392 +       .mv_writel              = generic_writel,
 393
 394 -       mv_irq_demux:           hd64465_irq_demux,
 395 +       .mv_irq_demux           = hd64465_irq_demux,
 396
 397 -       mv_rtc_gettimeofday:    sh_rtc_gettimeofday,
 398 -       mv_rtc_settimeofday:    sh_rtc_settimeofday,
 399 +       .mv_rtc_gettimeofday    = sh_rtc_gettimeofday,
 400 +       .mv_rtc_settimeofday    = sh_rtc_settimeofday,
 401  };
 402  ALIAS_MV(dmida)
 403
 404 diff -aur linux.backup/arch/sh/boards/dreamcast/irq.c linux/arch/sh/boards/dreamcast/irq.c
 405 --- linux.backup/arch/sh/boards/dreamcast/irq.c Thu Jun 26 23:47:25 2003
 406 +++ linux/arch/sh/boards/dreamcast/irq.c        Sat Aug 16 18:12:52 2003
 407 @@ -110,13 +110,13 @@
 408  }
 409
 410  struct hw_interrupt_type systemasic_int = {
 411 -        typename:       "System ASIC",
 412 -        startup:        startup_systemasic_irq,
 413 -        shutdown:       shutdown_systemasic_irq,
 414 -        enable:         enable_systemasic_irq,
 415 -        disable:        disable_systemasic_irq,
 416 -        ack:            ack_systemasic_irq,
 417 -        end:            end_systemasic_irq,
 418 +        .typename       = "System ASIC",
 419 +        .startup        = startup_systemasic_irq,
 420 +        .shutdown       = shutdown_systemasic_irq,
 421 +        .enable         = enable_systemasic_irq,
 422 +        .disable        = disable_systemasic_irq,
 423 +        .ack            = ack_systemasic_irq,
 424 +        .end            = end_systemasic_irq,
 425  };
 426
 427  /*
 428 diff -aur linux.backup/arch/sh/boards/dreamcast/mach.c linux/arch/sh/boards/dreamcast/mach.c
 429 --- linux.backup/arch/sh/boards/dreamcast/mach.c        Mon Jul 21 23:34:54 2003
 430 +++ linux/arch/sh/boards/dreamcast/mach.c       Sat Aug 16 15:45:00 2003
 431 @@ -21,40 +21,40 @@
 432   */
 433
 434  struct sh_machine_vector mv_dreamcast __initmv = {
 435 -       mv_nr_irqs:             NR_IRQS,
 436 +       .mv_nr_irqs             = NR_IRQS,
 437
 438 -       mv_inb:                 generic_inb,
 439 -       mv_inw:                 generic_inw,
 440 -       mv_inl:                 generic_inl,
 441 -       mv_outb:                generic_outb,
 442 -       mv_outw:                generic_outw,
 443 -       mv_outl:                generic_outl,
 444 -
 445 -       mv_inb_p:               generic_inb_p,
 446 -       mv_inw_p:               generic_inw,
 447 -       mv_inl_p:               generic_inl,
 448 -       mv_outb_p:              generic_outb_p,
 449 -       mv_outw_p:              generic_outw,
 450 -       mv_outl_p:              generic_outl,
 451 -
 452 -       mv_insb:                generic_insb,
 453 -       mv_insw:                generic_insw,
 454 -       mv_insl:                generic_insl,
 455 -       mv_outsb:               generic_outsb,
 456 -       mv_outsw:               generic_outsw,
 457 -       mv_outsl:               generic_outsl,
 458 -
 459 -       mv_readb:               generic_readb,
 460 -       mv_readw:               generic_readw,
 461 -       mv_readl:               generic_readl,
 462 -       mv_writeb:              generic_writeb,
 463 -       mv_writew:              generic_writew,
 464 -       mv_writel:              generic_writel,
 465 +       .mv_inb                 = generic_inb,
 466 +       .mv_inw                 = generic_inw,
 467 +       .mv_inl                 = generic_inl,
 468 +       .mv_outb                = generic_outb,
 469 +       .mv_outw                = generic_outw,
 470 +       .mv_outl                = generic_outl,
 471 +
 472 +       .mv_inb_p               = generic_inb_p,
 473 +       .mv_inw_p               = generic_inw,
 474 +       .mv_inl_p               = generic_inl,
 475 +       .mv_outb_p              = generic_outb_p,
 476 +       .mv_outw_p              = generic_outw,
 477 +       .mv_outl_p              = generic_outl,
 478 +
 479 +       .mv_insb                = generic_insb,
 480 +       .mv_insw                = generic_insw,
 481 +       .mv_insl                = generic_insl,
 482 +       .mv_outsb               = generic_outsb,
 483 +       .mv_outsw               = generic_outsw,
 484 +       .mv_outsl               = generic_outsl,
 485 +
 486 +       .mv_readb               = generic_readb,
 487 +       .mv_readw               = generic_readw,
 488 +       .mv_readl               = generic_readl,
 489 +       .mv_writeb              = generic_writeb,
 490 +       .mv_writew              = generic_writew,
 491 +       .mv_writel              = generic_writel,
 492
 493 -       mv_ioremap:             generic_ioremap,
 494 -       mv_iounmap:             generic_iounmap,
 495 +       .mv_ioremap             = generic_ioremap,
 496 +       .mv_iounmap             = generic_iounmap,
 497
 498 -       mv_isa_port2addr:       dreamcast_isa_port2addr,
 499 -       mv_irq_demux:           systemasic_irq_demux,
 500 +       .mv_isa_port2addr       = dreamcast_isa_port2addr,
 501 +       .mv_irq_demux           = systemasic_irq_demux,
 502  };
 503  ALIAS_MV(dreamcast)
 504 diff -aur linux.backup/arch/sh/boards/ec3104/irq.c linux/arch/sh/boards/ec3104/irq.c
 505 --- linux.backup/arch/sh/boards/ec3104/irq.c    Thu Jun 26 23:47:25 2003
 506 +++ linux/arch/sh/boards/ec3104/irq.c   Sat Aug 16 15:45:00 2003
 507 @@ -169,13 +169,13 @@
 508  }
 509
 510  static struct hw_interrupt_type ec3104_int = {
 511 -        typename:       "EC3104",
 512 -        enable:         enable_ec3104_irq,
 513 -        disable:        disable_ec3104_irq,
 514 -        ack:            mask_and_ack_ec3104_irq,
 515 -        end:            end_ec3104_irq,
 516 -        startup:        startup_ec3104_irq,
 517 -        shutdown:       shutdown_ec3104_irq,
 518 +        .typename       = "EC3104",
 519 +        .enable         = enable_ec3104_irq,
 520 +        .disable        = disable_ec3104_irq,
 521 +        .ack            = mask_and_ack_ec3104_irq,
 522 +        .end            = end_ec3104_irq,
 523 +        .startup        = startup_ec3104_irq,
 524 +        .shutdown       = shutdown_ec3104_irq,
 525  };
 526
 527  /* Yuck.  the _demux API is ugly */
 528 diff -aur linux.backup/arch/sh/boards/ec3104/mach.c linux/arch/sh/boards/ec3104/mach.c
 529 --- linux.backup/arch/sh/boards/ec3104/mach.c   Thu Jun 26 23:47:25 2003
 530 +++ linux/arch/sh/boards/ec3104/mach.c  Sat Aug 16 15:45:00 2003
 531 @@ -28,42 +28,42 @@
 532   */
 533
 534  struct sh_machine_vector mv_ec3104 __initmv = {
 535 -       mv_name:                "EC3104",
 536 +       .mv_name                = "EC3104",
 537
 538 -       mv_nr_irqs:             96,
 539 +       .mv_nr_irqs             = 96,
 540
 541 -       mv_inb:                 ec3104_inb,
 542 -       mv_inw:                 ec3104_inw,
 543 -       mv_inl:                 ec3104_inl,
 544 -       mv_outb:                ec3104_outb,
 545 -       mv_outw:                ec3104_outw,
 546 -       mv_outl:                ec3104_outl,
 547 -
 548 -       mv_inb_p:               generic_inb_p,
 549 -       mv_inw_p:               generic_inw,
 550 -       mv_inl_p:               generic_inl,
 551 -       mv_outb_p:              generic_outb_p,
 552 -       mv_outw_p:              generic_outw,
 553 -       mv_outl_p:              generic_outl,
 554 -
 555 -       mv_insb:                generic_insb,
 556 -       mv_insw:                generic_insw,
 557 -       mv_insl:                generic_insl,
 558 -       mv_outsb:               generic_outsb,
 559 -       mv_outsw:               generic_outsw,
 560 -       mv_outsl:               generic_outsl,
 561 -
 562 -       mv_readb:               generic_readb,
 563 -       mv_readw:               generic_readw,
 564 -       mv_readl:               generic_readl,
 565 -       mv_writeb:              generic_writeb,
 566 -       mv_writew:              generic_writew,
 567 -       mv_writel:              generic_writel,
 568 +       .mv_inb                 = ec3104_inb,
 569 +       .mv_inw                 = ec3104_inw,
 570 +       .mv_inl                 = ec3104_inl,
 571 +       .mv_outb                = ec3104_outb,
 572 +       .mv_outw                = ec3104_outw,
 573 +       .mv_outl                = ec3104_outl,
 574 +
 575 +       .mv_inb_p               = generic_inb_p,
 576 +       .mv_inw_p               = generic_inw,
 577 +       .mv_inl_p               = generic_inl,
 578 +       .mv_outb_p              = generic_outb_p,
 579 +       .mv_outw_p              = generic_outw,
 580 +       .mv_outl_p              = generic_outl,
 581 +
 582 +       .mv_insb                = generic_insb,
 583 +       .mv_insw                = generic_insw,
 584 +       .mv_insl                = generic_insl,
 585 +       .mv_outsb               = generic_outsb,
 586 +       .mv_outsw               = generic_outsw,
 587 +       .mv_outsl               = generic_outsl,
 588 +
 589 +       .mv_readb               = generic_readb,
 590 +       .mv_readw               = generic_readw,
 591 +       .mv_readl               = generic_readl,
 592 +       .mv_writeb              = generic_writeb,
 593 +       .mv_writew              = generic_writew,
 594 +       .mv_writel              = generic_writel,
 595
 596 -       mv_irq_demux:           ec3104_irq_demux,
 597 +       .mv_irq_demux           = ec3104_irq_demux,
 598
 599 -       mv_rtc_gettimeofday:    sh_rtc_gettimeofday,
 600 -       mv_rtc_settimeofday:    sh_rtc_settimeofday,
 601 +       .mv_rtc_gettimeofday    = sh_rtc_gettimeofday,
 602 +       .mv_rtc_settimeofday    = sh_rtc_settimeofday,
 603  };
 604
 605  ALIAS_MV(ec3104)
 606 diff -aur linux.backup/arch/sh/boards/harp/mach.c linux/arch/sh/boards/harp/mach.c
 607 --- linux.backup/arch/sh/boards/harp/mach.c     Thu Jun 26 23:47:25 2003
 608 +++ linux/arch/sh/boards/harp/mach.c    Sat Aug 16 18:13:06 2003
 609 @@ -26,46 +26,46 @@
 610   */
 611
 612  struct sh_machine_vector mv_harp __initmv = {
 613 -       mv_nr_irqs:             89 + HD64465_IRQ_NUM,
 614 +       .mv_nr_irqs             = 89 + HD64465_IRQ_NUM,
 615
 616 -       mv_inb:                 hd64465_inb,
 617 -       mv_inw:                 hd64465_inw,
 618 -       mv_inl:                 hd64465_inl,
 619 -       mv_outb:                hd64465_outb,
 620 -       mv_outw:                hd64465_outw,
 621 -       mv_outl:                hd64465_outl,
 622 -
 623 -       mv_inb_p:               hd64465_inb_p,
 624 -       mv_inw_p:               hd64465_inw,
 625 -       mv_inl_p:               hd64465_inl,
 626 -       mv_outb_p:              hd64465_outb_p,
 627 -       mv_outw_p:              hd64465_outw,
 628 -       mv_outl_p:              hd64465_outl,
 629 -
 630 -       mv_insb:                hd64465_insb,
 631 -       mv_insw:                hd64465_insw,
 632 -       mv_insl:                hd64465_insl,
 633 -       mv_outsb:               hd64465_outsb,
 634 -       mv_outsw:               hd64465_outsw,
 635 -       mv_outsl:               hd64465_outsl,
 636 -
 637 -       mv_readb:               generic_readb,
 638 -       mv_readw:               generic_readw,
 639 -       mv_readl:               generic_readl,
 640 -       mv_writeb:              generic_writeb,
 641 -       mv_writew:              generic_writew,
 642 -       mv_writel:              generic_writel,
 643 +       .mv_inb                 = hd64465_inb,
 644 +       .mv_inw                 = hd64465_inw,
 645 +       .mv_inl                 = hd64465_inl,
 646 +       .mv_outb                = hd64465_outb,
 647 +       .mv_outw                = hd64465_outw,
 648 +       .mv_outl                = hd64465_outl,
 649 +
 650 +       .mv_inb_p               = hd64465_inb_p,
 651 +       .mv_inw_p               = hd64465_inw,
 652 +       .mv_inl_p               = hd64465_inl,
 653 +       .mv_outb_p              = hd64465_outb_p,
 654 +       .mv_outw_p              = hd64465_outw,
 655 +       .mv_outl_p              = hd64465_outl,
 656 +
 657 +       .mv_insb                = hd64465_insb,
 658 +       .mv_insw                = hd64465_insw,
 659 +       .mv_insl                = hd64465_insl,
 660 +       .mv_outsb               = hd64465_outsb,
 661 +       .mv_outsw               = hd64465_outsw,
 662 +       .mv_outsl               = hd64465_outsl,
 663 +
 664 +       .mv_readb               = generic_readb,
 665 +       .mv_readw               = generic_readw,
 666 +       .mv_readl               = generic_readl,
 667 +       .mv_writeb              = generic_writeb,
 668 +       .mv_writew              = generic_writew,
 669 +       .mv_writel              = generic_writel,
 670
 671 -        mv_ioremap:             generic_ioremap,
 672 -        mv_iounmap:             generic_iounmap,
 673 +        .mv_ioremap             = generic_ioremap,
 674 +        .mv_iounmap             = generic_iounmap,
 675
 676 -        mv_isa_port2addr:       hd64465_isa_port2addr,
 677 +        .mv_isa_port2addr       = hd64465_isa_port2addr,
 678
 679  #ifdef CONFIG_PCI
 680 -       mv_init_irq:            init_harp_irq,
 681 +       .mv_init_irq            = init_harp_irq,
 682  #endif
 683  #ifdef CONFIG_HEARTBEAT
 684 -       mv_heartbeat:           heartbeat_harp,
 685 +       .mv_heartbeat           = heartbeat_harp,
 686  #endif
 687  };
 688
 689 diff -aur linux.backup/arch/sh/boards/hp6xx/hp620/mach.c linux/arch/sh/boards/hp6xx/hp620/mach.c
 690 --- linux.backup/arch/sh/boards/hp6xx/hp620/mach.c      Mon Jul 21 23:34:54 2003
 691 +++ linux/arch/sh/boards/hp6xx/hp620/mach.c     Sat Aug 16 15:45:00 2003
 692 @@ -24,41 +24,41 @@
 693   */
 694
 695  struct sh_machine_vector mv_hp620 __initmv = {
 696 -        mv_name:                "hp620",
 697 +        .mv_name                = "hp620",
 698
 699 -        mv_nr_irqs:             HD64461_IRQBASE+HD64461_IRQ_NUM,
 700 +        .mv_nr_irqs             = HD64461_IRQBASE+HD64461_IRQ_NUM,
 701
 702 -        mv_inb:                 hd64461_inb,
 703 -        mv_inw:                 hd64461_inw,
 704 -        mv_inl:                 hd64461_inl,
 705 -        mv_outb:                hd64461_outb,
 706 -        mv_outw:                hd64461_outw,
 707 -        mv_outl:                hd64461_outl,
 708 -
 709 -        mv_inb_p:               hd64461_inb_p,
 710 -        mv_inw_p:               hd64461_inw,
 711 -        mv_inl_p:               hd64461_inl,
 712 -        mv_outb_p:              hd64461_outb_p,
 713 -        mv_outw_p:              hd64461_outw,
 714 -        mv_outl_p:              hd64461_outl,
 715 -
 716 -        mv_insb:                hd64461_insb,
 717 -        mv_insw:                hd64461_insw,
 718 -        mv_insl:                hd64461_insl,
 719 -        mv_outsb:               hd64461_outsb,
 720 -        mv_outsw:               hd64461_outsw,
 721 -        mv_outsl:               hd64461_outsl,
 722 -
 723 -        mv_readb:               generic_readb,
 724 -        mv_readw:               generic_readw,
 725 -        mv_readl:               generic_readl,
 726 -        mv_writeb:              generic_writeb,
 727 -        mv_writew:              generic_writew,
 728 -        mv_writel:              generic_writel,
 729 +        .mv_inb                 = hd64461_inb,
 730 +        .mv_inw                 = hd64461_inw,
 731 +        .mv_inl                 = hd64461_inl,
 732 +        .mv_outb                = hd64461_outb,
 733 +        .mv_outw                = hd64461_outw,
 734 +        .mv_outl                = hd64461_outl,
 735 +
 736 +        .mv_inb_p               = hd64461_inb_p,
 737 +        .mv_inw_p               = hd64461_inw,
 738 +        .mv_inl_p               = hd64461_inl,
 739 +        .mv_outb_p              = hd64461_outb_p,
 740 +        .mv_outw_p              = hd64461_outw,
 741 +        .mv_outl_p              = hd64461_outl,
 742 +
 743 +        .mv_insb                = hd64461_insb,
 744 +        .mv_insw                = hd64461_insw,
 745 +        .mv_insl                = hd64461_insl,
 746 +        .mv_outsb               = hd64461_outsb,
 747 +        .mv_outsw               = hd64461_outsw,
 748 +        .mv_outsl               = hd64461_outsl,
 749 +
 750 +        .mv_readb               = generic_readb,
 751 +        .mv_readw               = generic_readw,
 752 +        .mv_readl               = generic_readl,
 753 +        .mv_writeb              = generic_writeb,
 754 +        .mv_writew              = generic_writew,
 755 +        .mv_writel              = generic_writel,
 756
 757 -        mv_irq_demux:           hd64461_irq_demux,
 758 +        .mv_irq_demux           = hd64461_irq_demux,
 759
 760 -        mv_rtc_gettimeofday:    sh_rtc_gettimeofday,
 761 -        mv_rtc_settimeofday:    sh_rtc_settimeofday,
 762 +        .mv_rtc_gettimeofday    = sh_rtc_gettimeofday,
 763 +        .mv_rtc_settimeofday    = sh_rtc_settimeofday,
 764  };
 765  ALIAS_MV(hp620)
 766 diff -aur linux.backup/arch/sh/boards/hp6xx/hp680/mach.c linux/arch/sh/boards/hp6xx/hp680/mach.c
 767 --- linux.backup/arch/sh/boards/hp6xx/hp680/mach.c      Mon Jul 21 23:34:54 2003
 768 +++ linux/arch/sh/boards/hp6xx/hp680/mach.c     Sat Aug 16 15:45:00 2003
 769 @@ -20,41 +20,41 @@
 770  #include <asm/irq.h>
 771
 772  struct sh_machine_vector mv_hp680 __initmv = {
 773 -        mv_name:                "hp680",
 774 +        .mv_name                = "hp680",
 775
 776 -        mv_nr_irqs:             HD64461_IRQBASE+HD64461_IRQ_NUM,
 777 +        .mv_nr_irqs             = HD64461_IRQBASE+HD64461_IRQ_NUM,
 778
 779 -        mv_inb:                 hd64461_inb,
 780 -        mv_inw:                 hd64461_inw,
 781 -        mv_inl:                 hd64461_inl,
 782 -        mv_outb:                hd64461_outb,
 783 -        mv_outw:                hd64461_outw,
 784 -        mv_outl:                hd64461_outl,
 785 -
 786 -        mv_inb_p:               hd64461_inb_p,
 787 -        mv_inw_p:               hd64461_inw,
 788 -        mv_inl_p:               hd64461_inl,
 789 -        mv_outb_p:              hd64461_outb_p,
 790 -        mv_outw_p:              hd64461_outw,
 791 -        mv_outl_p:              hd64461_outl,
 792 -
 793 -        mv_insb:                hd64461_insb,
 794 -        mv_insw:                hd64461_insw,
 795 -        mv_insl:                hd64461_insl,
 796 -        mv_outsb:               hd64461_outsb,
 797 -        mv_outsw:               hd64461_outsw,
 798 -        mv_outsl:               hd64461_outsl,
 799 -
 800 -        mv_readb:               generic_readb,
 801 -        mv_readw:               generic_readw,
 802 -        mv_readl:               generic_readl,
 803 -        mv_writeb:              generic_writeb,
 804 -        mv_writew:              generic_writew,
 805 -        mv_writel:              generic_writel,
 806 +        .mv_inb                 = hd64461_inb,
 807 +        .mv_inw                 = hd64461_inw,
 808 +        .mv_inl                 = hd64461_inl,
 809 +        .mv_outb                = hd64461_outb,
 810 +        .mv_outw                = hd64461_outw,
 811 +        .mv_outl                = hd64461_outl,
 812 +
 813 +        .mv_inb_p               = hd64461_inb_p,
 814 +        .mv_inw_p               = hd64461_inw,
 815 +        .mv_inl_p               = hd64461_inl,
 816 +        .mv_outb_p              = hd64461_outb_p,
 817 +        .mv_outw_p              = hd64461_outw,
 818 +        .mv_outl_p              = hd64461_outl,
 819 +
 820 +        .mv_insb                = hd64461_insb,
 821 +        .mv_insw                = hd64461_insw,
 822 +        .mv_insl                = hd64461_insl,
 823 +        .mv_outsb               = hd64461_outsb,
 824 +        .mv_outsw               = hd64461_outsw,
 825 +        .mv_outsl               = hd64461_outsl,
 826 +
 827 +        .mv_readb               = generic_readb,
 828 +        .mv_readw               = generic_readw,
 829 +        .mv_readl               = generic_readl,
 830 +        .mv_writeb              = generic_writeb,
 831 +        .mv_writew              = generic_writew,
 832 +        .mv_writel              = generic_writel,
 833
 834 -        mv_irq_demux:           hd64461_irq_demux,
 835 +        .mv_irq_demux           = hd64461_irq_demux,
 836
 837 -        mv_rtc_gettimeofday:    sh_rtc_gettimeofday,
 838 -        mv_rtc_settimeofday:    sh_rtc_settimeofday,
 839 +        .mv_rtc_gettimeofday    = sh_rtc_gettimeofday,
 840 +        .mv_rtc_settimeofday    = sh_rtc_settimeofday,
 841  };
 842  ALIAS_MV(hp680)
 843 diff -aur linux.backup/arch/sh/boards/hp6xx/hp690/mach.c linux/arch/sh/boards/hp6xx/hp690/mach.c
 844 --- linux.backup/arch/sh/boards/hp6xx/hp690/mach.c      Mon Jul 21 23:34:54 2003
 845 +++ linux/arch/sh/boards/hp6xx/hp690/mach.c     Sat Aug 16 15:45:00 2003
 846 @@ -20,41 +20,41 @@
 847  #include <asm/irq.h>
 848
 849  struct sh_machine_vector mv_hp690 __initmv = {
 850 -        mv_name:                "hp690",
 851 +        .mv_name                = "hp690",
 852
 853 -        mv_nr_irqs:             HD64461_IRQBASE+HD64461_IRQ_NUM,
 854 +        .mv_nr_irqs             = HD64461_IRQBASE+HD64461_IRQ_NUM,
 855
 856 -        mv_inb:                 hd64461_inb,
 857 -        mv_inw:                 hd64461_inw,
 858 -        mv_inl:                 hd64461_inl,
 859 -        mv_outb:                hd64461_outb,
 860 -        mv_outw:                hd64461_outw,
 861 -        mv_outl:                hd64461_outl,
 862 -
 863 -        mv_inb_p:               hd64461_inb_p,
 864 -        mv_inw_p:               hd64461_inw,
 865 -        mv_inl_p:               hd64461_inl,
 866 -        mv_outb_p:              hd64461_outb_p,
 867 -        mv_outw_p:              hd64461_outw,
 868 -        mv_outl_p:              hd64461_outl,
 869 -
 870 -        mv_insb:                hd64461_insb,
 871 -        mv_insw:                hd64461_insw,
 872 -        mv_insl:                hd64461_insl,
 873 -        mv_outsb:               hd64461_outsb,
 874 -        mv_outsw:               hd64461_outsw,
 875 -        mv_outsl:               hd64461_outsl,
 876 -
 877 -        mv_readb:               generic_readb,
 878 -        mv_readw:               generic_readw,
 879 -        mv_readl:               generic_readl,
 880 -        mv_writeb:              generic_writeb,
 881 -        mv_writew:              generic_writew,
 882 -        mv_writel:              generic_writel,
 883 +        .mv_inb                 = hd64461_inb,
 884 +        .mv_inw                 = hd64461_inw,
 885 +        .mv_inl                 = hd64461_inl,
 886 +        .mv_outb                = hd64461_outb,
 887 +        .mv_outw                = hd64461_outw,
 888 +        .mv_outl                = hd64461_outl,
 889 +
 890 +        .mv_inb_p               = hd64461_inb_p,
 891 +        .mv_inw_p               = hd64461_inw,
 892 +        .mv_inl_p               = hd64461_inl,
 893 +        .mv_outb_p              = hd64461_outb_p,
 894 +        .mv_outw_p              = hd64461_outw,
 895 +        .mv_outl_p              = hd64461_outl,
 896 +
 897 +        .mv_insb                = hd64461_insb,
 898 +        .mv_insw                = hd64461_insw,
 899 +        .mv_insl                = hd64461_insl,
 900 +        .mv_outsb               = hd64461_outsb,
 901 +        .mv_outsw               = hd64461_outsw,
 902 +        .mv_outsl               = hd64461_outsl,
 903 +
 904 +        .mv_readb               = generic_readb,
 905 +        .mv_readw               = generic_readw,
 906 +        .mv_readl               = generic_readl,
 907 +        .mv_writeb              = generic_writeb,
 908 +        .mv_writew              = generic_writew,
 909 +        .mv_writel              = generic_writel,
 910
 911 -        mv_irq_demux:           hd64461_irq_demux,
 912 +        .mv_irq_demux           = hd64461_irq_demux,
 913
 914 -        mv_rtc_gettimeofday:    sh_rtc_gettimeofday,
 915 -        mv_rtc_settimeofday:    sh_rtc_settimeofday,
 916 +        .mv_rtc_gettimeofday    = sh_rtc_gettimeofday,
 917 +        .mv_rtc_settimeofday    = sh_rtc_settimeofday,
 918  };
 919  ALIAS_MV(hp690)
 920 diff -aur linux.backup/arch/sh/boards/overdrive/mach.c linux/arch/sh/boards/overdrive/mach.c
 921 --- linux.backup/arch/sh/boards/overdrive/mach.c        Thu Jun 26 23:47:25 2003
 922 +++ linux/arch/sh/boards/overdrive/mach.c       Sat Aug 16 15:45:00 2003
 923 @@ -28,46 +28,46 @@
 924   */
 925
 926  struct sh_machine_vector mv_od __initmv = {
 927 -       mv_nr_irqs:             48,
 928 +       .mv_nr_irqs             = 48,
 929
 930 -       mv_inb:                 od_inb,
 931 -       mv_inw:                 od_inw,
 932 -       mv_inl:                 od_inl,
 933 -       mv_outb:                od_outb,
 934 -       mv_outw:                od_outw,
 935 -       mv_outl:                od_outl,
 936 -
 937 -       mv_inb_p:               od_inb_p,
 938 -       mv_inw_p:               od_inw_p,
 939 -       mv_inl_p:               od_inl_p,
 940 -       mv_outb_p:              od_outb_p,
 941 -       mv_outw_p:              od_outw_p,
 942 -       mv_outl_p:              od_outl_p,
 943 -
 944 -       mv_insb:                od_insb,
 945 -       mv_insw:                od_insw,
 946 -       mv_insl:                od_insl,
 947 -       mv_outsb:               od_outsb,
 948 -       mv_outsw:               od_outsw,
 949 -       mv_outsl:               od_outsl,
 950 -
 951 -       mv_readb:               generic_readb,
 952 -       mv_readw:               generic_readw,
 953 -       mv_readl:               generic_readl,
 954 -       mv_writeb:              generic_writeb,
 955 -       mv_writew:              generic_writew,
 956 -       mv_writel:              generic_writel,
 957 +       .mv_inb                 = od_inb,
 958 +       .mv_inw                 = od_inw,
 959 +       .mv_inl                 = od_inl,
 960 +       .mv_outb                = od_outb,
 961 +       .mv_outw                = od_outw,
 962 +       .mv_outl                = od_outl,
 963 +
 964 +       .mv_inb_p               = od_inb_p,
 965 +       .mv_inw_p               = od_inw_p,
 966 +       .mv_inl_p               = od_inl_p,
 967 +       .mv_outb_p              = od_outb_p,
 968 +       .mv_outw_p              = od_outw_p,
 969 +       .mv_outl_p              = od_outl_p,
 970 +
 971 +       .mv_insb                = od_insb,
 972 +       .mv_insw                = od_insw,
 973 +       .mv_insl                = od_insl,
 974 +       .mv_outsb               = od_outsb,
 975 +       .mv_outsw               = od_outsw,
 976 +       .mv_outsl               = od_outsl,
 977 +
 978 +       .mv_readb               = generic_readb,
 979 +       .mv_readw               = generic_readw,
 980 +       .mv_readl               = generic_readl,
 981 +       .mv_writeb              = generic_writeb,
 982 +       .mv_writew              = generic_writew,
 983 +       .mv_writel              = generic_writel,
 984
 985 -       mv_ioremap:             generic_ioremap,
 986 -       mv_iounmap:             generic_iounmap,
 987 +       .mv_ioremap             = generic_ioremap,
 988 +       .mv_iounmap             = generic_iounmap,
 989
 990 -       mv_isa_port2addr:       generic_isa_port2addr,
 991 +       .mv_isa_port2addr       = generic_isa_port2addr,
 992
 993  #ifdef CONFIG_PCI
 994 -       mv_init_irq:            init_overdrive_irq,
 995 +       .mv_init_irq            = init_overdrive_irq,
 996  #endif
 997  #ifdef CONFIG_HEARTBEAT
 998 -       mv_heartbeat:           heartbeat_od,
 999 +       .mv_heartbeat           = heartbeat_od,
1000  #endif
1001  };
1002
1003 diff -aur linux.backup/arch/sh/boards/saturn/irq.c linux/arch/sh/boards/saturn/irq.c
1004 --- linux.backup/arch/sh/boards/saturn/irq.c    Thu Jun 26 23:47:25 2003
1005 +++ linux/arch/sh/boards/saturn/irq.c   Sat Aug 16 15:45:00 2003
1006 @@ -102,13 +102,13 @@
1007  }
1008
1009  static struct hw_interrupt_type saturn_int = {
1010 -       typename:       "Saturn",
1011 -       enable:         enable_saturn_irq,
1012 -       disable:        disable_saturn_irq,
1013 -       ack:            mask_and_ack_saturn_irq,
1014 -       end:            end_saturn_irq,
1015 -       startup:        startup_saturn_irq,
1016 -       shutdown:       shutdown_saturn_irq,
1017 +       .typename       = "Saturn",
1018 +       .enable         = enable_saturn_irq,
1019 +       .disable        = disable_saturn_irq,
1020 +       .ack            = mask_and_ack_saturn_irq,
1021 +       .end            = end_saturn_irq,
1022 +       .startup        = startup_saturn_irq,
1023 +       .shutdown       = shutdown_saturn_irq,
1024  };
1025
1026  int saturn_irq_demux(int irq_nr)
1027 diff -aur linux.backup/arch/sh/boards/saturn/mach.c linux/arch/sh/boards/saturn/mach.c
1028 --- linux.backup/arch/sh/boards/saturn/mach.c   Mon Jul 21 23:34:54 2003
1029 +++ linux/arch/sh/boards/saturn/mach.c  Sat Aug 16 18:14:01 2003
1030 @@ -18,41 +18,41 @@
1031   * The Machine Vector
1032   */
1033  struct sh_machine_vector mv_saturn __initmv = {
1034 -        mv_nr_irqs:             80,    /* Fix this later */
1035 +        .mv_nr_irqs             = 80,  /* Fix this later */
1036
1037 -        mv_inb:                 generic_inb,
1038 -        mv_inw:                 generic_inw,
1039 -        mv_inl:                 generic_inl,
1040 -        mv_outb:                generic_outb,
1041 -        mv_outw:                generic_outw,
1042 -        mv_outl:                generic_outl,
1043 -
1044 -        mv_inb_p:               generic_inb_p,
1045 -        mv_inw_p:               generic_inw_p,
1046 -        mv_inl_p:               generic_inl_p,
1047 -        mv_outb_p:              generic_outb_p,
1048 -        mv_outw_p:              generic_outw_p,
1049 -        mv_outl_p:              generic_outl_p,
1050 -
1051 -        mv_insb:                generic_insb,
1052 -        mv_insw:                generic_insw,
1053 -        mv_insl:                generic_insl,
1054 -        mv_outsb:               generic_outsb,
1055 -        mv_outsw:               generic_outsw,
1056 -        mv_outsl:               generic_outsl,
1057 -
1058 -        mv_readb:               generic_readb,
1059 -        mv_readw:               generic_readw,
1060 -        mv_readl:               generic_readl,
1061 -        mv_writeb:              generic_writeb,
1062 -        mv_writew:              generic_writew,
1063 -        mv_writel:              generic_writel,
1064 +        .mv_inb                 = generic_inb,
1065 +        .mv_inw                 = generic_inw,
1066 +        .mv_inl                 = generic_inl,
1067 +        .mv_outb                = generic_outb,
1068 +        .mv_outw                = generic_outw,
1069 +        .mv_outl                = generic_outl,
1070 +
1071 +        .mv_inb_p               = generic_inb_p,
1072 +        .mv_inw_p               = generic_inw_p,
1073 +        .mv_inl_p               = generic_inl_p,
1074 +        .mv_outb_p              = generic_outb_p,
1075 +        .mv_outw_p              = generic_outw_p,
1076 +        .mv_outl_p              = generic_outl_p,
1077 +
1078 +        .mv_insb                = generic_insb,
1079 +        .mv_insw                = generic_insw,
1080 +        .mv_insl                = generic_insl,
1081 +        .mv_outsb               = generic_outsb,
1082 +        .mv_outsw               = generic_outsw,
1083 +        .mv_outsl               = generic_outsl,
1084 +
1085 +        .mv_readb               = generic_readb,
1086 +        .mv_readw               = generic_readw,
1087 +        .mv_readl               = generic_readl,
1088 +        .mv_writeb              = generic_writeb,
1089 +        .mv_writew              = generic_writew,
1090 +        .mv_writel              = generic_writel,
1091
1092 -        mv_isa_port2addr:       saturn_isa_port2addr,
1093 -       mv_irq_demux:           saturn_irq_demux,
1094 +        .mv_isa_port2addr       = saturn_isa_port2addr,
1095 +       .mv_irq_demux           = saturn_irq_demux,
1096
1097 -        mv_ioremap:             saturn_ioremap,
1098 -        mv_iounmap:             saturn_iounmap,
1099 +        .mv_ioremap             = saturn_ioremap,
1100 +        .mv_iounmap             = saturn_iounmap,
1101  };
1102
1103  ALIAS_MV(saturn)
1104 diff -aur linux.backup/arch/sh/boards/se/770x/mach.c linux/arch/sh/boards/se/770x/mach.c
1105 --- linux.backup/arch/sh/boards/se/770x/mach.c  Mon Jul 21 23:34:54 2003
1106 +++ linux/arch/sh/boards/se/770x/mach.c Sat Aug 16 15:45:00 2003
1107 @@ -28,49 +28,49 @@
1108
1109  struct sh_machine_vector mv_se __initmv = {
1110  #if defined(CONFIG_CPU_SH4)
1111 -       mv_nr_irqs:             48,
1112 +       .mv_nr_irqs             = 48,
1113  #elif defined(CONFIG_CPU_SUBTYPE_SH7708)
1114 -       mv_nr_irqs:             32,
1115 +       .mv_nr_irqs             = 32,
1116  #elif defined(CONFIG_CPU_SUBTYPE_SH7709)
1117 -       mv_nr_irqs:             61,
1118 +       .mv_nr_irqs             = 61,
1119  #endif
1120
1121 -       mv_inb:                 se_inb,
1122 -       mv_inw:                 se_inw,
1123 -       mv_inl:                 se_inl,
1124 -       mv_outb:                se_outb,
1125 -       mv_outw:                se_outw,
1126 -       mv_outl:                se_outl,
1127 -
1128 -       mv_inb_p:               se_inb_p,
1129 -       mv_inw_p:               se_inw,
1130 -       mv_inl_p:               se_inl,
1131 -       mv_outb_p:              se_outb_p,
1132 -       mv_outw_p:              se_outw,
1133 -       mv_outl_p:              se_outl,
1134 -
1135 -       mv_insb:                se_insb,
1136 -       mv_insw:                se_insw,
1137 -       mv_insl:                se_insl,
1138 -       mv_outsb:               se_outsb,
1139 -       mv_outsw:               se_outsw,
1140 -       mv_outsl:               se_outsl,
1141 -
1142 -       mv_readb:               se_readb,
1143 -       mv_readw:               se_readw,
1144 -       mv_readl:               se_readl,
1145 -       mv_writeb:              se_writeb,
1146 -       mv_writew:              se_writew,
1147 -       mv_writel:              se_writel,
1148 +       .mv_inb                 = se_inb,
1149 +       .mv_inw                 = se_inw,
1150 +       .mv_inl                 = se_inl,
1151 +       .mv_outb                = se_outb,
1152 +       .mv_outw                = se_outw,
1153 +       .mv_outl                = se_outl,
1154 +
1155 +       .mv_inb_p               = se_inb_p,
1156 +       .mv_inw_p               = se_inw,
1157 +       .mv_inl_p               = se_inl,
1158 +       .mv_outb_p              = se_outb_p,
1159 +       .mv_outw_p              = se_outw,
1160 +       .mv_outl_p              = se_outl,
1161 +
1162 +       .mv_insb                = se_insb,
1163 +       .mv_insw                = se_insw,
1164 +       .mv_insl                = se_insl,
1165 +       .mv_outsb               = se_outsb,
1166 +       .mv_outsw               = se_outsw,
1167 +       .mv_outsl               = se_outsl,
1168 +
1169 +       .mv_readb               = se_readb,
1170 +       .mv_readw               = se_readw,
1171 +       .mv_readl               = se_readl,
1172 +       .mv_writeb              = se_writeb,
1173 +       .mv_writew              = se_writew,
1174 +       .mv_writel              = se_writel,
1175
1176 -       mv_ioremap:             generic_ioremap,
1177 -       mv_iounmap:             generic_iounmap,
1178 +       .mv_ioremap             = generic_ioremap,
1179 +       .mv_iounmap             = generic_iounmap,
1180
1181 -       mv_isa_port2addr:       se_isa_port2addr,
1182 +       .mv_isa_port2addr       = se_isa_port2addr,
1183
1184 -       mv_init_irq:            init_se_IRQ,
1185 +       .mv_init_irq            = init_se_IRQ,
1186  #ifdef CONFIG_HEARTBEAT
1187 -       mv_heartbeat:           heartbeat_se,
1188 +       .mv_heartbeat           = heartbeat_se,
1189  #endif
1190  };
1191  ALIAS_MV(se)
1192 diff -aur linux.backup/arch/sh/boards/se/7751/mach.c linux/arch/sh/boards/se/7751/mach.c
1193 --- linux.backup/arch/sh/boards/se/7751/mach.c  Mon Jul 21 23:34:54 2003
1194 +++ linux/arch/sh/boards/se/7751/mach.c Sat Aug 16 15:45:00 2003
1195 @@ -26,44 +26,44 @@
1196   */
1197
1198  struct sh_machine_vector mv_7751se __initmv = {
1199 -       mv_nr_irqs:             72,
1200 +       .mv_nr_irqs             = 72,
1201
1202 -       mv_inb:                 sh7751se_inb,
1203 -       mv_inw:                 sh7751se_inw,
1204 -       mv_inl:                 sh7751se_inl,
1205 -       mv_outb:                sh7751se_outb,
1206 -       mv_outw:                sh7751se_outw,
1207 -       mv_outl:                sh7751se_outl,
1208 -
1209 -       mv_inb_p:               sh7751se_inb_p,
1210 -       mv_inw_p:               sh7751se_inw,
1211 -       mv_inl_p:               sh7751se_inl,
1212 -       mv_outb_p:              sh7751se_outb_p,
1213 -       mv_outw_p:              sh7751se_outw,
1214 -       mv_outl_p:              sh7751se_outl,
1215 -
1216 -       mv_insb:                sh7751se_insb,
1217 -       mv_insw:                sh7751se_insw,
1218 -       mv_insl:                sh7751se_insl,
1219 -       mv_outsb:               sh7751se_outsb,
1220 -       mv_outsw:               sh7751se_outsw,
1221 -       mv_outsl:               sh7751se_outsl,
1222 -
1223 -       mv_readb:               sh7751se_readb,
1224 -       mv_readw:               sh7751se_readw,
1225 -       mv_readl:               sh7751se_readl,
1226 -       mv_writeb:              sh7751se_writeb,
1227 -       mv_writew:              sh7751se_writew,
1228 -       mv_writel:              sh7751se_writel,
1229 +       .mv_inb                 = sh7751se_inb,
1230 +       .mv_inw                 = sh7751se_inw,
1231 +       .mv_inl                 = sh7751se_inl,
1232 +       .mv_outb                = sh7751se_outb,
1233 +       .mv_outw                = sh7751se_outw,
1234 +       .mv_outl                = sh7751se_outl,
1235 +
1236 +       .mv_inb_p               = sh7751se_inb_p,
1237 +       .mv_inw_p               = sh7751se_inw,
1238 +       .mv_inl_p               = sh7751se_inl,
1239 +       .mv_outb_p              = sh7751se_outb_p,
1240 +       .mv_outw_p              = sh7751se_outw,
1241 +       .mv_outl_p              = sh7751se_outl,
1242 +
1243 +       .mv_insb                = sh7751se_insb,
1244 +       .mv_insw                = sh7751se_insw,
1245 +       .mv_insl                = sh7751se_insl,
1246 +       .mv_outsb               = sh7751se_outsb,
1247 +       .mv_outsw               = sh7751se_outsw,
1248 +       .mv_outsl               = sh7751se_outsl,
1249 +
1250 +       .mv_readb               = sh7751se_readb,
1251 +       .mv_readw               = sh7751se_readw,
1252 +       .mv_readl               = sh7751se_readl,
1253 +       .mv_writeb              = sh7751se_writeb,
1254 +       .mv_writew              = sh7751se_writew,
1255 +       .mv_writel              = sh7751se_writel,
1256
1257 -       mv_ioremap:             generic_ioremap,
1258 -       mv_iounmap:             generic_iounmap,
1259 +       .mv_ioremap             = generic_ioremap,
1260 +       .mv_iounmap             = generic_iounmap,
1261
1262 -       mv_isa_port2addr:       sh7751se_isa_port2addr,
1263 +       .mv_isa_port2addr       = sh7751se_isa_port2addr,
1264
1265 -       mv_init_irq:            init_7751se_IRQ,
1266 +       .mv_init_irq            = init_7751se_IRQ,
1267  #ifdef CONFIG_HEARTBEAT
1268 -       mv_heartbeat:           heartbeat_7751se,
1269 +       .mv_heartbeat           = heartbeat_7751se,
1270  #endif
1271  };
1272  ALIAS_MV(7751se)
1273 diff -aur linux.backup/arch/sh/boards/sh2000/mach.c linux/arch/sh/boards/sh2000/mach.c
1274 --- linux.backup/arch/sh/boards/sh2000/mach.c   Mon Jul 21 23:34:54 2003
1275 +++ linux/arch/sh/boards/sh2000/mach.c  Sat Aug 16 15:45:00 2003
1276 @@ -19,39 +19,39 @@
1277   */
1278
1279  struct sh_machine_vector mv_sh2000 __initmv = {
1280 -        mv_nr_irqs:             80,
1281 +        .mv_nr_irqs             = 80,
1282
1283 -        mv_inb:                 generic_inb,
1284 -        mv_inw:                 generic_inw,
1285 -        mv_inl:                 generic_inl,
1286 -        mv_outb:                generic_outb,
1287 -        mv_outw:                generic_outw,
1288 -        mv_outl:                generic_outl,
1289 -
1290 -        mv_inb_p:               generic_inb_p,
1291 -        mv_inw_p:               generic_inw_p,
1292 -        mv_inl_p:               generic_inl_p,
1293 -        mv_outb_p:              generic_outb_p,
1294 -        mv_outw_p:              generic_outw_p,
1295 -        mv_outl_p:              generic_outl_p,
1296 -
1297 -        mv_insb:                generic_insb,
1298 -        mv_insw:                generic_insw,
1299 -        mv_insl:                generic_insl,
1300 -        mv_outsb:               generic_outsb,
1301 -        mv_outsw:               generic_outsw,
1302 -        mv_outsl:               generic_outsl,
1303 -
1304 -        mv_readb:               generic_readb,
1305 -        mv_readw:               generic_readw,
1306 -        mv_readl:               generic_readl,
1307 -        mv_writeb:              generic_writeb,
1308 -        mv_writew:              generic_writew,
1309 -        mv_writel:              generic_writel,
1310 +        .mv_inb                 = generic_inb,
1311 +        .mv_inw                 = generic_inw,
1312 +        .mv_inl                 = generic_inl,
1313 +        .mv_outb                = generic_outb,
1314 +        .mv_outw                = generic_outw,
1315 +        .mv_outl                = generic_outl,
1316 +
1317 +        .mv_inb_p               = generic_inb_p,
1318 +        .mv_inw_p               = generic_inw_p,
1319 +        .mv_inl_p               = generic_inl_p,
1320 +        .mv_outb_p              = generic_outb_p,
1321 +        .mv_outw_p              = generic_outw_p,
1322 +        .mv_outl_p              = generic_outl_p,
1323 +
1324 +        .mv_insb                = generic_insb,
1325 +        .mv_insw                = generic_insw,
1326 +        .mv_insl                = generic_insl,
1327 +        .mv_outsb               = generic_outsb,
1328 +        .mv_outsw               = generic_outsw,
1329 +        .mv_outsl               = generic_outsl,
1330 +
1331 +        .mv_readb               = generic_readb,
1332 +        .mv_readw               = generic_readw,
1333 +        .mv_readl               = generic_readl,
1334 +        .mv_writeb              = generic_writeb,
1335 +        .mv_writew              = generic_writew,
1336 +        .mv_writel              = generic_writel,
1337
1338 -        mv_isa_port2addr:       sh2000_isa_port2addr,
1339 +        .mv_isa_port2addr       = sh2000_isa_port2addr,
1340
1341 -        mv_ioremap:             generic_ioremap,
1342 -        mv_iounmap:             generic_iounmap,
1343 +        .mv_ioremap             = generic_ioremap,
1344 +        .mv_iounmap             = generic_iounmap,
1345  };
1346  ALIAS_MV(sh2000)
1347 diff -aur linux.backup/arch/sh/boards/unknown/mach.c linux/arch/sh/boards/unknown/mach.c
1348 --- linux.backup/arch/sh/boards/unknown/mach.c  Thu Jun 26 23:47:25 2003
1349 +++ linux/arch/sh/boards/unknown/mach.c Sat Aug 16 15:45:00 2003
1350 @@ -24,44 +24,44 @@
1351
1352  struct sh_machine_vector mv_unknown __initmv = {
1353  #if defined(CONFIG_CPU_SH4)
1354 -       mv_nr_irqs:             48,
1355 +       .mv_nr_irqs             = 48,
1356  #elif defined(CONFIG_CPU_SUBTYPE_SH7708)
1357 -       mv_nr_irqs:             32,
1358 +       .mv_nr_irqs             = 32,
1359  #elif defined(CONFIG_CPU_SUBTYPE_SH7709)
1360 -       mv_nr_irqs:             61,
1361 +       .mv_nr_irqs             = 61,
1362  #endif
1363
1364 -       mv_inb:                 unknown_inb,
1365 -       mv_inw:                 unknown_inw,
1366 -       mv_inl:                 unknown_inl,
1367 -       mv_outb:                unknown_outb,
1368 -       mv_outw:                unknown_outw,
1369 -       mv_outl:                unknown_outl,
1370 -
1371 -       mv_inb_p:               unknown_inb_p,
1372 -       mv_inw_p:               unknown_inw_p,
1373 -       mv_inl_p:               unknown_inl_p,
1374 -       mv_outb_p:              unknown_outb_p,
1375 -       mv_outw_p:              unknown_outw_p,
1376 -       mv_outl_p:              unknown_outl_p,
1377 -
1378 -       mv_insb:                unknown_insb,
1379 -       mv_insw:                unknown_insw,
1380 -       mv_insl:                unknown_insl,
1381 -       mv_outsb:               unknown_outsb,
1382 -       mv_outsw:               unknown_outsw,
1383 -       mv_outsl:               unknown_outsl,
1384 -
1385 -       mv_readb:               unknown_readb,
1386 -       mv_readw:               unknown_readw,
1387 -       mv_readl:               unknown_readl,
1388 -       mv_writeb:              unknown_writeb,
1389 -       mv_writew:              unknown_writew,
1390 -       mv_writel:              unknown_writel,
1391 +       .mv_inb                 = unknown_inb,
1392 +       .mv_inw                 = unknown_inw,
1393 +       .mv_inl                 = unknown_inl,
1394 +       .mv_outb                = unknown_outb,
1395 +       .mv_outw                = unknown_outw,
1396 +       .mv_outl                = unknown_outl,
1397 +
1398 +       .mv_inb_p               = unknown_inb_p,
1399 +       .mv_inw_p               = unknown_inw_p,
1400 +       .mv_inl_p               = unknown_inl_p,
1401 +       .mv_outb_p              = unknown_outb_p,
1402 +       .mv_outw_p              = unknown_outw_p,
1403 +       .mv_outl_p              = unknown_outl_p,
1404 +
1405 +       .mv_insb                = unknown_insb,
1406 +       .mv_insw                = unknown_insw,
1407 +       .mv_insl                = unknown_insl,
1408 +       .mv_outsb               = unknown_outsb,
1409 +       .mv_outsw               = unknown_outsw,
1410 +       .mv_outsl               = unknown_outsl,
1411 +
1412 +       .mv_readb               = unknown_readb,
1413 +       .mv_readw               = unknown_readw,
1414 +       .mv_readl               = unknown_readl,
1415 +       .mv_writeb              = unknown_writeb,
1416 +       .mv_writew              = unknown_writew,
1417 +       .mv_writel              = unknown_writel,
1418
1419 -       mv_ioremap:             unknown_ioremap,
1420 -       mv_iounmap:             unknown_iounmap,
1421 +       .mv_ioremap             = unknown_ioremap,
1422 +       .mv_iounmap             = unknown_iounmap,
1423
1424 -       mv_isa_port2addr:       unknown_isa_port2addr,
1425 +       .mv_isa_port2addr       = unknown_isa_port2addr,
1426  };
1427  ALIAS_MV(unknown)
1428 diff -aur linux.backup/arch/sh/cchips/hd6446x/hd64465/setup.c linux/arch/sh/cchips/hd6446x/hd64465/setup.c
1429 --- linux.backup/arch/sh/cchips/hd6446x/hd64465/setup.c Thu Jun 26 23:47:25 2003
1430 +++ linux/arch/sh/cchips/hd6446x/hd64465/setup.c        Sat Aug 16 18:14:54 2003
1431 @@ -89,13 +89,13 @@
1432
1433
1434  static struct hw_interrupt_type hd64465_irq_type = {
1435 -       typename:       "HD64465-IRQ",
1436 -       startup:        startup_hd64465_irq,
1437 -       shutdown:       shutdown_hd64465_irq,
1438 -       enable:         enable_hd64465_irq,
1439 -       disable:        disable_hd64465_irq,
1440 -       ack:            mask_and_ack_hd64465,
1441 -       end:            end_hd64465_irq
1442 +       .typename       = "HD64465-IRQ",
1443 +       .startup        = startup_hd64465_irq,
1444 +       .shutdown       = shutdown_hd64465_irq,
1445 +       .enable         = enable_hd64465_irq,
1446 +       .disable        = disable_hd64465_irq,
1447 +       .ack            = mask_and_ack_hd64465,
1448 +       .end            = end_hd64465_irq
1449  };
1450
1451