Merge with mainline.

diff --cc arch/alpha/kernel/sys_alcor.c
index 9eda25b6308666e706487d08e75b77bfa4cc131a,ee8d04a82646f13b6522c575252b41e3a3fa7858..e190c58be8383b1908aa2c6b6e449e5650d98584
--- 1/arch/alpha/kernel/sys_alcor.c
--- 2/arch/alpha/kernel/sys_alcor.c
+++ b/arch/alpha/kernel/sys_alcor.c
@@@ -250,24 -250,24 +250,24 @@@ struct alpha_machine_vector alcor_mv __
        DO_DEFAULT_RTC,
        DO_CIA_IO,
        DO_CIA_BUS,
 -      machine_check:          cia_machine_check,
 -      max_isa_dma_address:    ALPHA_ALCOR_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         EISA_DEFAULT_IO_BASE,
 -      min_mem_address:        CIA_DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                48,
 -      device_interrupt:       alcor_device_interrupt,
 -
 -      init_arch:              cia_init_arch,
 -      init_irq:               alcor_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               cia_init_pci,
 -      kill_arch:              alcor_kill_arch,
 -      pci_map_irq:            alcor_map_irq,
 -      pci_swizzle:            common_swizzle,
 -
 -      sys: { cia: {
 -          gru_int_req_bits:   ALCOR_GRU_INT_REQ_BITS
 +      .machine_check          = cia_machine_check,
-       .max_dma_address        = ALPHA_ALCOR_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_ALCOR_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = EISA_DEFAULT_IO_BASE,
 +      .min_mem_address        = CIA_DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = 48,
 +      .device_interrupt       = alcor_device_interrupt,
 +
 +      .init_arch              = cia_init_arch,
 +      .init_irq               = alcor_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = cia_init_pci,
 +      .kill_arch              = alcor_kill_arch,
 +      .pci_map_irq            = alcor_map_irq,
 +      .pci_swizzle            = common_swizzle,
 +
 +      .sys = { .cia = {
 +          .gru_int_req_bits   = ALCOR_GRU_INT_REQ_BITS
        }}
  };
  ALIAS_MV(alcor)
@@@ -280,24 -280,24 +280,24 @@@ struct alpha_machine_vector xlt_mv __in
        DO_DEFAULT_RTC,
        DO_CIA_IO,
        DO_CIA_BUS,
 -      machine_check:          cia_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         EISA_DEFAULT_IO_BASE,
 -      min_mem_address:        CIA_DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                48,
 -      device_interrupt:       alcor_device_interrupt,
 -
 -      init_arch:              cia_init_arch,
 -      init_irq:               alcor_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               cia_init_pci,
 -      kill_arch:              alcor_kill_arch,
 -      pci_map_irq:            alcor_map_irq,
 -      pci_swizzle:            common_swizzle,
 -
 -      sys: { cia: {
 -          gru_int_req_bits:   XLT_GRU_INT_REQ_BITS
 +      .machine_check          = cia_machine_check,
-       .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = EISA_DEFAULT_IO_BASE,
 +      .min_mem_address        = CIA_DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = 48,
 +      .device_interrupt       = alcor_device_interrupt,
 +
 +      .init_arch              = cia_init_arch,
 +      .init_irq               = alcor_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = cia_init_pci,
 +      .kill_arch              = alcor_kill_arch,
 +      .pci_map_irq            = alcor_map_irq,
 +      .pci_swizzle            = common_swizzle,
 +
 +      .sys = { .cia = {
 +          .gru_int_req_bits   = XLT_GRU_INT_REQ_BITS
        }}
  };
  ALIAS_MV(xlt)

diff --cc arch/alpha/kernel/sys_cabriolet.c
index 68fb947bb057e85252a16cb09e7cdb7a166e189f,ce35e2709bef348676a664b61a7204d5ebe69453..e4efafd96ed74ae83b9bca161e25c9c2751d6d83
--- 1/arch/alpha/kernel/sys_cabriolet.c
--- 2/arch/alpha/kernel/sys_cabriolet.c
+++ b/arch/alpha/kernel/sys_cabriolet.c
@@@ -326,21 -326,21 +326,21 @@@ struct alpha_machine_vector cabriolet_m
        DO_DEFAULT_RTC,
        DO_APECS_IO,
        DO_APECS_BUS,
 -      machine_check:          apecs_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        APECS_AND_LCA_DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                35,
 -      device_interrupt:       cabriolet_device_interrupt,
 -
 -      init_arch:              apecs_init_arch,
 -      init_irq:               cabriolet_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               cabriolet_init_pci,
 -      kill_arch:              NULL,
 -      pci_map_irq:            cabriolet_map_irq,
 -      pci_swizzle:            common_swizzle,
 +      .machine_check          = apecs_machine_check,
-       .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = APECS_AND_LCA_DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = 35,
 +      .device_interrupt       = cabriolet_device_interrupt,
 +
 +      .init_arch              = apecs_init_arch,
 +      .init_irq               = cabriolet_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = cabriolet_init_pci,
 +      .kill_arch              = NULL,
 +      .pci_map_irq            = cabriolet_map_irq,
 +      .pci_swizzle            = common_swizzle,
  };
  #ifndef CONFIG_ALPHA_EB64P
  ALIAS_MV(cabriolet)
@@@ -354,20 -354,20 +354,20 @@@ struct alpha_machine_vector eb164_mv __
        DO_DEFAULT_RTC,
        DO_CIA_IO,
        DO_CIA_BUS,
 -      machine_check:          cia_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        CIA_DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                35,
 -      device_interrupt:       cabriolet_device_interrupt,
 -
 -      init_arch:              cia_init_arch,
 -      init_irq:               cabriolet_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               cia_cab_init_pci,
 -      pci_map_irq:            cabriolet_map_irq,
 -      pci_swizzle:            common_swizzle,
 +      .machine_check          = cia_machine_check,
-       .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = CIA_DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = 35,
 +      .device_interrupt       = cabriolet_device_interrupt,
 +
 +      .init_arch              = cia_init_arch,
 +      .init_irq               = cabriolet_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = cia_cab_init_pci,
 +      .pci_map_irq            = cabriolet_map_irq,
 +      .pci_swizzle            = common_swizzle,
  };
  ALIAS_MV(eb164)
  #endif
@@@ -379,20 -379,20 +379,20 @@@ struct alpha_machine_vector eb66p_mv __
        DO_DEFAULT_RTC,
        DO_LCA_IO,
        DO_LCA_BUS,
 -      machine_check:          lca_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        APECS_AND_LCA_DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                35,
 -      device_interrupt:       cabriolet_device_interrupt,
 -
 -      init_arch:              lca_init_arch,
 -      init_irq:               cabriolet_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               cabriolet_init_pci,
 -      pci_map_irq:            eb66p_map_irq,
 -      pci_swizzle:            common_swizzle,
 +      .machine_check          = lca_machine_check,
-       .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = APECS_AND_LCA_DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = 35,
 +      .device_interrupt       = cabriolet_device_interrupt,
 +
 +      .init_arch              = lca_init_arch,
 +      .init_irq               = cabriolet_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = cabriolet_init_pci,
 +      .pci_map_irq            = eb66p_map_irq,
 +      .pci_swizzle            = common_swizzle,
  };
  ALIAS_MV(eb66p)
  #endif
@@@ -404,21 -404,21 +404,21 @@@ struct alpha_machine_vector lx164_mv __
        DO_DEFAULT_RTC,
        DO_PYXIS_IO,
        DO_CIA_BUS,
 -      machine_check:          cia_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        DEFAULT_MEM_BASE,
 -      pci_dac_offset:         PYXIS_DAC_OFFSET,
 -
 -      nr_irqs:                35,
 -      device_interrupt:       cabriolet_device_interrupt,
 -
 -      init_arch:              pyxis_init_arch,
 -      init_irq:               cabriolet_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               alphapc164_init_pci,
 -      pci_map_irq:            alphapc164_map_irq,
 -      pci_swizzle:            common_swizzle,
 +      .machine_check          = cia_machine_check,
-       .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = DEFAULT_MEM_BASE,
 +      .pci_dac_offset         = PYXIS_DAC_OFFSET,
 +
 +      .nr_irqs                = 35,
 +      .device_interrupt       = cabriolet_device_interrupt,
 +
 +      .init_arch              = pyxis_init_arch,
 +      .init_irq               = cabriolet_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = alphapc164_init_pci,
 +      .pci_map_irq            = alphapc164_map_irq,
 +      .pci_swizzle            = common_swizzle,
  };
  ALIAS_MV(lx164)
  #endif
@@@ -430,20 -430,20 +430,20 @@@ struct alpha_machine_vector pc164_mv __
        DO_DEFAULT_RTC,
        DO_CIA_IO,
        DO_CIA_BUS,
 -      machine_check:          cia_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        CIA_DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                35,
 -      device_interrupt:       pc164_device_interrupt,
 -
 -      init_arch:              cia_init_arch,
 -      init_irq:               pc164_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               alphapc164_init_pci,
 -      pci_map_irq:            alphapc164_map_irq,
 -      pci_swizzle:            common_swizzle,
 +      .machine_check          = cia_machine_check,
-       .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = CIA_DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = 35,
 +      .device_interrupt       = pc164_device_interrupt,
 +
 +      .init_arch              = cia_init_arch,
 +      .init_irq               = pc164_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = alphapc164_init_pci,
 +      .pci_map_irq            = alphapc164_map_irq,
 +      .pci_swizzle            = common_swizzle,
  };
  ALIAS_MV(pc164)
  #endif

diff --cc arch/alpha/kernel/sys_dp264.c
index 20d9ef272bf3b970b5fffc16288efaafecf32a75,099fd213d637c4adcc9a6b1d9c9eb48c1b992ea8..0b77aa68722ac70f4566750343f9cfef8b9fdd78
--- 1/arch/alpha/kernel/sys_dp264.c
--- 2/arch/alpha/kernel/sys_dp264.c
+++ b/arch/alpha/kernel/sys_dp264.c
@@@ -571,22 -571,22 +571,22 @@@ struct alpha_machine_vector dp264_mv __
        DO_DEFAULT_RTC,
        DO_TSUNAMI_IO,
        DO_TSUNAMI_BUS,
 -      machine_check:          tsunami_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        DEFAULT_MEM_BASE,
 -      pci_dac_offset:         TSUNAMI_DAC_OFFSET,
 -
 -      nr_irqs:                64,
 -      device_interrupt:       dp264_device_interrupt,
 -
 -      init_arch:              tsunami_init_arch,
 -      init_irq:               dp264_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               dp264_init_pci,
 -      kill_arch:              tsunami_kill_arch,
 -      pci_map_irq:            dp264_map_irq,
 -      pci_swizzle:            common_swizzle,
 +      .machine_check          = tsunami_machine_check,
-       .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = DEFAULT_MEM_BASE,
 +      .pci_dac_offset         = TSUNAMI_DAC_OFFSET,
 +
 +      .nr_irqs                = 64,
 +      .device_interrupt       = dp264_device_interrupt,
 +
 +      .init_arch              = tsunami_init_arch,
 +      .init_irq               = dp264_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = dp264_init_pci,
 +      .kill_arch              = tsunami_kill_arch,
 +      .pci_map_irq            = dp264_map_irq,
 +      .pci_swizzle            = common_swizzle,
  };
  ALIAS_MV(dp264)
  
@@@ -596,22 -596,22 +596,22 @@@ struct alpha_machine_vector monet_mv __
        DO_DEFAULT_RTC,
        DO_TSUNAMI_IO,
        DO_TSUNAMI_BUS,
 -      machine_check:          tsunami_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        DEFAULT_MEM_BASE,
 -      pci_dac_offset:         TSUNAMI_DAC_OFFSET,
 -
 -      nr_irqs:                64,
 -      device_interrupt:       dp264_device_interrupt,
 -
 -      init_arch:              tsunami_init_arch,
 -      init_irq:               dp264_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               monet_init_pci,
 -      kill_arch:              tsunami_kill_arch,
 -      pci_map_irq:            monet_map_irq,
 -      pci_swizzle:            monet_swizzle,
 +      .machine_check          = tsunami_machine_check,
-       .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = DEFAULT_MEM_BASE,
 +      .pci_dac_offset         = TSUNAMI_DAC_OFFSET,
 +
 +      .nr_irqs                = 64,
 +      .device_interrupt       = dp264_device_interrupt,
 +
 +      .init_arch              = tsunami_init_arch,
 +      .init_irq               = dp264_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = monet_init_pci,
 +      .kill_arch              = tsunami_kill_arch,
 +      .pci_map_irq            = monet_map_irq,
 +      .pci_swizzle            = monet_swizzle,
  };
  
  struct alpha_machine_vector webbrick_mv __initmv = {
@@@ -620,22 -620,22 +620,22 @@@
        DO_DEFAULT_RTC,
        DO_TSUNAMI_IO,
        DO_TSUNAMI_BUS,
 -      machine_check:          tsunami_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        DEFAULT_MEM_BASE,
 -      pci_dac_offset:         TSUNAMI_DAC_OFFSET,
 -
 -      nr_irqs:                64,
 -      device_interrupt:       dp264_device_interrupt,
 -
 -      init_arch:              webbrick_init_arch,
 -      init_irq:               dp264_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               common_init_pci,
 -      kill_arch:              tsunami_kill_arch,
 -      pci_map_irq:            webbrick_map_irq,
 -      pci_swizzle:            common_swizzle,
 +      .machine_check          = tsunami_machine_check,
-       .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = DEFAULT_MEM_BASE,
 +      .pci_dac_offset         = TSUNAMI_DAC_OFFSET,
 +
 +      .nr_irqs                = 64,
 +      .device_interrupt       = dp264_device_interrupt,
 +
 +      .init_arch              = webbrick_init_arch,
 +      .init_irq               = dp264_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = common_init_pci,
 +      .kill_arch              = tsunami_kill_arch,
 +      .pci_map_irq            = webbrick_map_irq,
 +      .pci_swizzle            = common_swizzle,
  };
  
  struct alpha_machine_vector clipper_mv __initmv = {
@@@ -644,22 -644,22 +644,22 @@@
        DO_DEFAULT_RTC,
        DO_TSUNAMI_IO,
        DO_TSUNAMI_BUS,
 -      machine_check:          tsunami_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        DEFAULT_MEM_BASE,
 -      pci_dac_offset:         TSUNAMI_DAC_OFFSET,
 -
 -      nr_irqs:                64,
 -      device_interrupt:       dp264_device_interrupt,
 -
 -      init_arch:              tsunami_init_arch,
 -      init_irq:               clipper_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               common_init_pci,
 -      kill_arch:              tsunami_kill_arch,
 -      pci_map_irq:            clipper_map_irq,
 -      pci_swizzle:            common_swizzle,
 +      .machine_check          = tsunami_machine_check,
-       .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = DEFAULT_MEM_BASE,
 +      .pci_dac_offset         = TSUNAMI_DAC_OFFSET,
 +
 +      .nr_irqs                = 64,
 +      .device_interrupt       = dp264_device_interrupt,
 +
 +      .init_arch              = tsunami_init_arch,
 +      .init_irq               = clipper_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = common_init_pci,
 +      .kill_arch              = tsunami_kill_arch,
 +      .pci_map_irq            = clipper_map_irq,
 +      .pci_swizzle            = common_swizzle,
  };
  
  /* Sharks strongly resemble Clipper, at least as far
@@@ -673,22 -673,22 +673,22 @@@ struct alpha_machine_vector shark_mv __
        DO_DEFAULT_RTC,
        DO_TSUNAMI_IO,
        DO_TSUNAMI_BUS,
 -      machine_check:          tsunami_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        DEFAULT_MEM_BASE,
 -      pci_dac_offset:         TSUNAMI_DAC_OFFSET,
 -
 -      nr_irqs:                64,
 -      device_interrupt:       dp264_device_interrupt,
 -
 -      init_arch:              tsunami_init_arch,
 -      init_irq:               clipper_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               common_init_pci,
 -      kill_arch:              tsunami_kill_arch,
 -      pci_map_irq:            clipper_map_irq,
 -      pci_swizzle:            common_swizzle,
 +      .machine_check          = tsunami_machine_check,
-       .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = DEFAULT_MEM_BASE,
 +      .pci_dac_offset         = TSUNAMI_DAC_OFFSET,
 +
 +      .nr_irqs                = 64,
 +      .device_interrupt       = dp264_device_interrupt,
 +
 +      .init_arch              = tsunami_init_arch,
 +      .init_irq               = clipper_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = common_init_pci,
 +      .kill_arch              = tsunami_kill_arch,
 +      .pci_map_irq            = clipper_map_irq,
 +      .pci_swizzle            = common_swizzle,
  };
  
  /* No alpha_mv alias for webbrick/monet/clipper, since we compile them

diff --cc arch/alpha/kernel/sys_eb64p.c
index eb92418ff98bae5e479fd67bce0497c3fa958ec8,d47b054185f83c9829cc9a0a07b17f348f5074db..035af0b47fb4e93d6d547dd27664353e7018e103
--- 1/arch/alpha/kernel/sys_eb64p.c
--- 2/arch/alpha/kernel/sys_eb64p.c
+++ b/arch/alpha/kernel/sys_eb64p.c
@@@ -213,21 -213,21 +213,21 @@@ struct alpha_machine_vector eb64p_mv __
        DO_DEFAULT_RTC,
        DO_APECS_IO,
        DO_APECS_BUS,
 -      machine_check:          apecs_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        APECS_AND_LCA_DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                32,
 -      device_interrupt:       eb64p_device_interrupt,
 -
 -      init_arch:              apecs_init_arch,
 -      init_irq:               eb64p_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               common_init_pci,
 -      kill_arch:              NULL,
 -      pci_map_irq:            eb64p_map_irq,
 -      pci_swizzle:            common_swizzle,
 +      .machine_check          = apecs_machine_check,
-       .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = APECS_AND_LCA_DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = 32,
 +      .device_interrupt       = eb64p_device_interrupt,
 +
 +      .init_arch              = apecs_init_arch,
 +      .init_irq               = eb64p_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = common_init_pci,
 +      .kill_arch              = NULL,
 +      .pci_map_irq            = eb64p_map_irq,
 +      .pci_swizzle            = common_swizzle,
  };
  ALIAS_MV(eb64p)
  #endif
@@@ -239,20 -239,20 +239,20 @@@ struct alpha_machine_vector eb66_mv __i
        DO_DEFAULT_RTC,
        DO_LCA_IO,
        DO_LCA_BUS,
 -      machine_check:          lca_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        APECS_AND_LCA_DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                32,
 -      device_interrupt:       eb64p_device_interrupt,
 -
 -      init_arch:              lca_init_arch,
 -      init_irq:               eb64p_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               common_init_pci,
 -      pci_map_irq:            eb64p_map_irq,
 -      pci_swizzle:            common_swizzle,
 +      .machine_check          = lca_machine_check,
-       .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = APECS_AND_LCA_DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = 32,
 +      .device_interrupt       = eb64p_device_interrupt,
 +
 +      .init_arch              = lca_init_arch,
 +      .init_irq               = eb64p_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = common_init_pci,
 +      .pci_map_irq            = eb64p_map_irq,
 +      .pci_swizzle            = common_swizzle,
  };
  ALIAS_MV(eb66)
  #endif

diff --cc arch/alpha/kernel/sys_eiger.c
index 5e223221d1b8dc859ec3cbe5113b5d5cea43355a,436c9b109027a77c51d59333c7b4df7523ee79bc..8e91eb6e46c0153b56527216fc5d7002977a193e
--- 1/arch/alpha/kernel/sys_eiger.c
--- 2/arch/alpha/kernel/sys_eiger.c
+++ b/arch/alpha/kernel/sys_eiger.c
@@@ -230,21 -230,21 +230,21 @@@ struct alpha_machine_vector eiger_mv __
        DO_DEFAULT_RTC,
        DO_TSUNAMI_IO,
        DO_TSUNAMI_BUS,
 -      machine_check:          tsunami_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        DEFAULT_MEM_BASE,
 -      pci_dac_offset:         TSUNAMI_DAC_OFFSET,
 -
 -      nr_irqs:                128,
 -      device_interrupt:       eiger_device_interrupt,
 -
 -      init_arch:              tsunami_init_arch,
 -      init_irq:               eiger_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               common_init_pci,
 -      kill_arch:              tsunami_kill_arch,
 -      pci_map_irq:            eiger_map_irq,
 -      pci_swizzle:            eiger_swizzle,
 +      .machine_check          = tsunami_machine_check,
-       .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = DEFAULT_MEM_BASE,
 +      .pci_dac_offset         = TSUNAMI_DAC_OFFSET,
 +
 +      .nr_irqs                = 128,
 +      .device_interrupt       = eiger_device_interrupt,
 +
 +      .init_arch              = tsunami_init_arch,
 +      .init_irq               = eiger_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = common_init_pci,
 +      .kill_arch              = tsunami_kill_arch,
 +      .pci_map_irq            = eiger_map_irq,
 +      .pci_swizzle            = eiger_swizzle,
  };
  ALIAS_MV(eiger)

diff --cc arch/alpha/kernel/sys_jensen.c
index f6c5de49843c3f0c3373af1e389eb99ef37ae877,06ca2d3442d468e4bcd5c8e724194f66e1fe95d3..dd9c2e5073b4a38b6ff8038a6666d400110bb910
--- 1/arch/alpha/kernel/sys_jensen.c
--- 2/arch/alpha/kernel/sys_jensen.c
+++ b/arch/alpha/kernel/sys_jensen.c
@@@ -256,17 -261,17 +261,17 @@@ struct alpha_machine_vector jensen_mv _
        DO_EV4_MMU,
        IO_LITE(JENSEN,jensen),
        BUS(jensen),
 -      machine_check:          jensen_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      rtc_port:               0x170,
 -
 -      nr_irqs:                16,
 -      device_interrupt:       jensen_device_interrupt,
 -
 -      init_arch:              jensen_init_arch,
 -      init_irq:               jensen_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               NULL,
 -      kill_arch:              NULL,
 +      .machine_check          = jensen_machine_check,
-       .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .rtc_port               = 0x170,
 +
 +      .nr_irqs                = 16,
 +      .device_interrupt       = jensen_device_interrupt,
 +
 +      .init_arch              = jensen_init_arch,
 +      .init_irq               = jensen_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = NULL,
 +      .kill_arch              = NULL,
  };
  ALIAS_MV(jensen)

diff --cc arch/alpha/kernel/sys_miata.c
index e2c7ddbeef2f17160357f927a5cb4a3e9f103e9c,08fb5c66407aad8540eee325e0a50515be6e763f..ce09e1c7af3316137b69165da20855f9ecf20a66
--- 1/arch/alpha/kernel/sys_miata.c
--- 2/arch/alpha/kernel/sys_miata.c
+++ b/arch/alpha/kernel/sys_miata.c
@@@ -266,21 -266,21 +266,21 @@@ struct alpha_machine_vector miata_mv __
        DO_DEFAULT_RTC,
        DO_PYXIS_IO,
        DO_CIA_BUS,
 -      machine_check:          cia_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        DEFAULT_MEM_BASE,
 -      pci_dac_offset:         PYXIS_DAC_OFFSET,
 +      .machine_check          = cia_machine_check,
-       .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = DEFAULT_MEM_BASE,
 +      .pci_dac_offset         = PYXIS_DAC_OFFSET,
  
 -      nr_irqs:                48,
 -      device_interrupt:       pyxis_device_interrupt,
 +      .nr_irqs                = 48,
 +      .device_interrupt       = pyxis_device_interrupt,
  
 -      init_arch:              pyxis_init_arch,
 -      init_irq:               miata_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               miata_init_pci,
 -      kill_arch:              miata_kill_arch,
 -      pci_map_irq:            miata_map_irq,
 -      pci_swizzle:            miata_swizzle,
 +      .init_arch              = pyxis_init_arch,
 +      .init_irq               = miata_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = miata_init_pci,
 +      .kill_arch              = miata_kill_arch,
 +      .pci_map_irq            = miata_map_irq,
 +      .pci_swizzle            = miata_swizzle,
  };
  ALIAS_MV(miata)

diff --cc arch/alpha/kernel/sys_mikasa.c
index f06e342c71d98ee67657a4c6e8ccdb3e3b5d20c2,23240694f5c555e1693d4e43d93fc72445e781a1..78b193dede07a1ec416a3b758e76072690a2c0f9
--- 1/arch/alpha/kernel/sys_mikasa.c
--- 2/arch/alpha/kernel/sys_mikasa.c
+++ b/arch/alpha/kernel/sys_mikasa.c
@@@ -222,21 -222,21 +222,21 @@@ struct alpha_machine_vector mikasa_mv _
        DO_DEFAULT_RTC,
        DO_APECS_IO,
        DO_APECS_BUS,
 -      machine_check:          mikasa_apecs_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        APECS_AND_LCA_DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                32,
 -      device_interrupt:       mikasa_device_interrupt,
 -
 -      init_arch:              apecs_init_arch,
 -      init_irq:               mikasa_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               common_init_pci,
 -      kill_arch:              NULL,
 -      pci_map_irq:            mikasa_map_irq,
 -      pci_swizzle:            common_swizzle,
 +      .machine_check          = mikasa_apecs_machine_check,
-       .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = APECS_AND_LCA_DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = 32,
 +      .device_interrupt       = mikasa_device_interrupt,
 +
 +      .init_arch              = apecs_init_arch,
 +      .init_irq               = mikasa_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = common_init_pci,
 +      .kill_arch              = NULL,
 +      .pci_map_irq            = mikasa_map_irq,
 +      .pci_swizzle            = common_swizzle,
  };
  ALIAS_MV(mikasa)
  #endif
@@@ -248,20 -248,20 +248,20 @@@ struct alpha_machine_vector mikasa_prim
        DO_DEFAULT_RTC,
        DO_CIA_IO,
        DO_CIA_BUS,
 -      machine_check:          cia_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        CIA_DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                32,
 -      device_interrupt:       mikasa_device_interrupt,
 -
 -      init_arch:              cia_init_arch,
 -      init_irq:               mikasa_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               cia_init_pci,
 -      pci_map_irq:            mikasa_map_irq,
 -      pci_swizzle:            common_swizzle,
 +      .machine_check          = cia_machine_check,
-       .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = CIA_DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = 32,
 +      .device_interrupt       = mikasa_device_interrupt,
 +
 +      .init_arch              = cia_init_arch,
 +      .init_irq               = mikasa_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = cia_init_pci,
 +      .pci_map_irq            = mikasa_map_irq,
 +      .pci_swizzle            = common_swizzle,
  };
  ALIAS_MV(mikasa_primo)
  #endif

diff --cc arch/alpha/kernel/sys_nautilus.c
index bc4538a99ce5aad62ede81717d7b61a1a2d21293,47282bf9bd1659156a106602c8bc2636dd24faac..f7b036adf165e591cbfaf0a690bbf094e4cd3c8a
--- 1/arch/alpha/kernel/sys_nautilus.c
--- 2/arch/alpha/kernel/sys_nautilus.c
+++ b/arch/alpha/kernel/sys_nautilus.c
@@@ -515,20 -515,20 +515,20 @@@ struct alpha_machine_vector nautilus_m
        DO_DEFAULT_RTC,
        DO_IRONGATE_IO,
        DO_IRONGATE_BUS,
 -      machine_check:          nautilus_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        IRONGATE_DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                16,
 -      device_interrupt:       isa_device_interrupt,
 -
 -      init_arch:              irongate_init_arch,
 -      init_irq:               nautilus_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               common_init_pci,
 -      kill_arch:              nautilus_kill_arch,
 -      pci_map_irq:            nautilus_map_irq,
 -      pci_swizzle:            common_swizzle,
 +      .machine_check          = nautilus_machine_check,
-       .max_dma_address        = ALPHA_NAUTILUS_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = IRONGATE_DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = 16,
 +      .device_interrupt       = isa_device_interrupt,
 +
 +      .init_arch              = irongate_init_arch,
 +      .init_irq               = nautilus_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = common_init_pci,
 +      .kill_arch              = nautilus_kill_arch,
 +      .pci_map_irq            = nautilus_map_irq,
 +      .pci_swizzle            = common_swizzle,
  };
  ALIAS_MV(nautilus)

diff --cc arch/alpha/kernel/sys_noritake.c
index 3e3aecf94b360a3e38bf3177adee28057c13cd0f,2d4d44a941065f926ae81b6cc0cbb5074083706f..598d5fe7e867a9f644d8d4ec68881f12d373babe
--- 1/arch/alpha/kernel/sys_noritake.c
--- 2/arch/alpha/kernel/sys_noritake.c
+++ b/arch/alpha/kernel/sys_noritake.c
@@@ -304,21 -304,21 +304,21 @@@ struct alpha_machine_vector noritake_m
        DO_DEFAULT_RTC,
        DO_APECS_IO,
        DO_APECS_BUS,
 -      machine_check:          noritake_apecs_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         EISA_DEFAULT_IO_BASE,
 -      min_mem_address:        APECS_AND_LCA_DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                48,
 -      device_interrupt:       noritake_device_interrupt,
 -
 -      init_arch:              apecs_init_arch,
 -      init_irq:               noritake_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               common_init_pci,
 -      kill_arch:              NULL,
 -      pci_map_irq:            noritake_map_irq,
 -      pci_swizzle:            noritake_swizzle,
 +      .machine_check          = noritake_apecs_machine_check,
-       .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = EISA_DEFAULT_IO_BASE,
 +      .min_mem_address        = APECS_AND_LCA_DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = 48,
 +      .device_interrupt       = noritake_device_interrupt,
 +
 +      .init_arch              = apecs_init_arch,
 +      .init_irq               = noritake_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = common_init_pci,
 +      .kill_arch              = NULL,
 +      .pci_map_irq            = noritake_map_irq,
 +      .pci_swizzle            = noritake_swizzle,
  };
  ALIAS_MV(noritake)
  #endif
@@@ -330,20 -330,20 +330,20 @@@ struct alpha_machine_vector noritake_pr
        DO_DEFAULT_RTC,
        DO_CIA_IO,
        DO_CIA_BUS,
 -      machine_check:          cia_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         EISA_DEFAULT_IO_BASE,
 -      min_mem_address:        CIA_DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                48,
 -      device_interrupt:       noritake_device_interrupt,
 -
 -      init_arch:              cia_init_arch,
 -      init_irq:               noritake_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               cia_init_pci,
 -      pci_map_irq:            noritake_map_irq,
 -      pci_swizzle:            noritake_swizzle,
 +      .machine_check          = cia_machine_check,
-       .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = EISA_DEFAULT_IO_BASE,
 +      .min_mem_address        = CIA_DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = 48,
 +      .device_interrupt       = noritake_device_interrupt,
 +
 +      .init_arch              = cia_init_arch,
 +      .init_irq               = noritake_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = cia_init_pci,
 +      .pci_map_irq            = noritake_map_irq,
 +      .pci_swizzle            = noritake_swizzle,
  };
  ALIAS_MV(noritake_primo)
  #endif

diff --cc arch/alpha/kernel/sys_rawhide.c
index 6ad2ccfd187828d280ce595279e385dad8f4b7fb,77b1aaf0b054768c981a13d16606634c346edee2..0724393a43ce19b28f528d1320947382980242da
--- 1/arch/alpha/kernel/sys_rawhide.c
--- 2/arch/alpha/kernel/sys_rawhide.c
+++ b/arch/alpha/kernel/sys_rawhide.c
@@@ -251,21 -251,21 +251,21 @@@ struct alpha_machine_vector rawhide_mv 
        DO_DEFAULT_RTC,
        DO_MCPCIA_IO,
        DO_MCPCIA_BUS,
 -      machine_check:          mcpcia_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        MCPCIA_DEFAULT_MEM_BASE,
 -      pci_dac_offset:         MCPCIA_DAC_OFFSET,
 -
 -      nr_irqs:                128,
 -      device_interrupt:       rawhide_srm_device_interrupt,
 -
 -      init_arch:              mcpcia_init_arch,
 -      init_irq:               rawhide_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               common_init_pci,
 -      kill_arch:              NULL,
 -      pci_map_irq:            rawhide_map_irq,
 -      pci_swizzle:            common_swizzle,
 +      .machine_check          = mcpcia_machine_check,
-       .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = MCPCIA_DEFAULT_MEM_BASE,
 +      .pci_dac_offset         = MCPCIA_DAC_OFFSET,
 +
 +      .nr_irqs                = 128,
 +      .device_interrupt       = rawhide_srm_device_interrupt,
 +
 +      .init_arch              = mcpcia_init_arch,
 +      .init_irq               = rawhide_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = common_init_pci,
 +      .kill_arch              = NULL,
 +      .pci_map_irq            = rawhide_map_irq,
 +      .pci_swizzle            = common_swizzle,
  };
  ALIAS_MV(rawhide)

diff --cc arch/alpha/kernel/sys_ruffian.c
index 7f7977c20ecdabe1a4568c41f80ea21a7d0afc4d,d5729f98b24d8dd503827ef2301df47835d6de27..035d5dcc6e8876d3d08facdcb91172b426d1f95b
--- 1/arch/alpha/kernel/sys_ruffian.c
--- 2/arch/alpha/kernel/sys_ruffian.c
+++ b/arch/alpha/kernel/sys_ruffian.c
@@@ -217,21 -217,21 +217,21 @@@ struct alpha_machine_vector ruffian_mv 
        DO_DEFAULT_RTC,
        DO_PYXIS_IO,
        DO_CIA_BUS,
 -      machine_check:          cia_machine_check,
 -      max_isa_dma_address:    ALPHA_RUFFIAN_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        DEFAULT_MEM_BASE,
 -      pci_dac_offset:         PYXIS_DAC_OFFSET,
 -
 -      nr_irqs:                48,
 -      device_interrupt:       pyxis_device_interrupt,
 -
 -      init_arch:              pyxis_init_arch,
 -      init_irq:               ruffian_init_irq,
 -      init_rtc:               ruffian_init_rtc,
 -      init_pci:               cia_init_pci,
 -      kill_arch:              ruffian_kill_arch,
 -      pci_map_irq:            ruffian_map_irq,
 -      pci_swizzle:            ruffian_swizzle,
 +      .machine_check          = cia_machine_check,
-       .max_dma_address        = ALPHA_RUFFIAN_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_RUFFIAN_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = DEFAULT_MEM_BASE,
 +      .pci_dac_offset         = PYXIS_DAC_OFFSET,
 +
 +      .nr_irqs                = 48,
 +      .device_interrupt       = pyxis_device_interrupt,
 +
 +      .init_arch              = pyxis_init_arch,
 +      .init_irq               = ruffian_init_irq,
 +      .init_rtc               = ruffian_init_rtc,
 +      .init_pci               = cia_init_pci,
 +      .kill_arch              = ruffian_kill_arch,
 +      .pci_map_irq            = ruffian_map_irq,
 +      .pci_swizzle            = ruffian_swizzle,
  };
  ALIAS_MV(ruffian)

diff --cc arch/alpha/kernel/sys_rx164.c
index cdf8b666d3abeb2bb13c4ec0745e2618dfcdb4ac,cf3953d203a1d2f6cc22633c5069b5a448050e5c..3dcbd2717f0115208272befc0c369d828ae77a89
--- 1/arch/alpha/kernel/sys_rx164.c
--- 2/arch/alpha/kernel/sys_rx164.c
+++ b/arch/alpha/kernel/sys_rx164.c
@@@ -202,20 -202,20 +202,20 @@@ struct alpha_machine_vector rx164_mv __
        DO_DEFAULT_RTC,
        DO_POLARIS_IO,
        DO_POLARIS_BUS,
 -      machine_check:          polaris_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                40,
 -      device_interrupt:       rx164_device_interrupt,
 -
 -      init_arch:              polaris_init_arch,
 -      init_irq:               rx164_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               common_init_pci,
 -      kill_arch:              NULL,
 -      pci_map_irq:            rx164_map_irq,
 -      pci_swizzle:            common_swizzle,
 +      .machine_check          = polaris_machine_check,
-       .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = 40,
 +      .device_interrupt       = rx164_device_interrupt,
 +
 +      .init_arch              = polaris_init_arch,
 +      .init_irq               = rx164_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = common_init_pci,
 +      .kill_arch              = NULL,
 +      .pci_map_irq            = rx164_map_irq,
 +      .pci_swizzle            = common_swizzle,
  };
  ALIAS_MV(rx164)

diff --cc arch/alpha/kernel/sys_sable.c
index 587a4bc4a00f159348099abdc2fca8089f81546c,defbe57c60c56633876c8ba98eac55d3e405bd32..a7d1db738c9bb57259f1eb2d8e43fa083211daa1
--- 1/arch/alpha/kernel/sys_sable.c
--- 2/arch/alpha/kernel/sys_sable.c
+++ b/arch/alpha/kernel/sys_sable.c
@@@ -289,24 -289,24 +289,24 @@@ struct alpha_machine_vector sable_mv __
        DO_DEFAULT_RTC,
        DO_T2_IO,
        DO_T2_BUS,
 -      machine_check:          t2_machine_check,
 -      max_isa_dma_address:    ALPHA_SABLE_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         EISA_DEFAULT_IO_BASE,
 -      min_mem_address:        T2_DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                40,
 -      device_interrupt:       sable_srm_device_interrupt,
 -
 -      init_arch:              t2_init_arch,
 -      init_irq:               sable_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               common_init_pci,
 -      kill_arch:              NULL,
 -      pci_map_irq:            sable_map_irq,
 -      pci_swizzle:            common_swizzle,
 -
 -      sys: { t2: {
 -          gamma_bias:         0
 +      .machine_check          = t2_machine_check,
-       .max_dma_address        = ALPHA_SABLE_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_SABLE_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = EISA_DEFAULT_IO_BASE,
 +      .min_mem_address        = T2_DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = 40,
 +      .device_interrupt       = sable_srm_device_interrupt,
 +
 +      .init_arch              = t2_init_arch,
 +      .init_irq               = sable_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = common_init_pci,
 +      .kill_arch              = NULL,
 +      .pci_map_irq            = sable_map_irq,
 +      .pci_swizzle            = common_swizzle,
 +
 +      .sys = { .t2 = {
 +          .gamma_bias         = 0
        } }
  };
  ALIAS_MV(sable)
@@@ -321,23 -321,23 +321,23 @@@ struct alpha_machine_vector sable_gamma
        DO_DEFAULT_RTC,
        DO_T2_IO,
        DO_T2_BUS,
 -      machine_check:          t2_machine_check,
 -      max_isa_dma_address:    ALPHA_SABLE_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         EISA_DEFAULT_IO_BASE,
 -      min_mem_address:        T2_DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                40,
 -      device_interrupt:       sable_srm_device_interrupt,
 -
 -      init_arch:              t2_init_arch,
 -      init_irq:               sable_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               common_init_pci,
 -      pci_map_irq:            sable_map_irq,
 -      pci_swizzle:            common_swizzle,
 -
 -      sys: { t2: {
 -          gamma_bias:         _GAMMA_BIAS
 +      .machine_check          = t2_machine_check,
-       .max_dma_address        = ALPHA_SABLE_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_SABLE_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = EISA_DEFAULT_IO_BASE,
 +      .min_mem_address        = T2_DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = 40,
 +      .device_interrupt       = sable_srm_device_interrupt,
 +
 +      .init_arch              = t2_init_arch,
 +      .init_irq               = sable_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = common_init_pci,
 +      .pci_map_irq            = sable_map_irq,
 +      .pci_swizzle            = common_swizzle,
 +
 +      .sys = { .t2 = {
 +          .gamma_bias         = _GAMMA_BIAS
        } }
  };
  ALIAS_MV(sable_gamma)

diff --cc arch/alpha/kernel/sys_sio.c
index dfa9fe57ad9a3184949b951bdadc351ea2329d21,6830099dbd5963600b68b3ff24bc0bd06275ac0e..8c79f4f4080623db063c24692228f407b6dbe797
--- 1/arch/alpha/kernel/sys_sio.c
--- 2/arch/alpha/kernel/sys_sio.c
+++ b/arch/alpha/kernel/sys_sio.c
@@@ -257,25 -257,25 +257,25 @@@ struct alpha_machine_vector alphabook1_
        DO_DEFAULT_RTC,
        DO_LCA_IO,
        DO_LCA_BUS,
 -      machine_check:          lca_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        APECS_AND_LCA_DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                16,
 -      device_interrupt:       isa_device_interrupt,
 -
 -      init_arch:              alphabook1_init_arch,
 -      init_irq:               sio_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               alphabook1_init_pci,
 -      kill_arch:              NULL,
 -      pci_map_irq:            noname_map_irq,
 -      pci_swizzle:            common_swizzle,
 -
 -      sys: { sio: {
 +      .machine_check          = lca_machine_check,
-       .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = APECS_AND_LCA_DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = 16,
 +      .device_interrupt       = isa_device_interrupt,
 +
 +      .init_arch              = alphabook1_init_arch,
 +      .init_irq               = sio_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = alphabook1_init_pci,
 +      .kill_arch              = NULL,
 +      .pci_map_irq            = noname_map_irq,
 +      .pci_swizzle            = common_swizzle,
 +
 +      .sys = { .sio = {
                /* NCR810 SCSI is 14, PCMCIA controller is 15.  */
 -              route_tab:      0x0e0f0a0a,
 +              .route_tab      = 0x0e0f0a0a,
        }}
  };
  ALIAS_MV(alphabook1)
@@@ -288,23 -288,23 +288,23 @@@ struct alpha_machine_vector avanti_mv _
        DO_DEFAULT_RTC,
        DO_APECS_IO,
        DO_APECS_BUS,
 -      machine_check:          apecs_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        APECS_AND_LCA_DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                16,
 -      device_interrupt:       isa_device_interrupt,
 -
 -      init_arch:              apecs_init_arch,
 -      init_irq:               sio_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               noname_init_pci,
 -      pci_map_irq:            noname_map_irq,
 -      pci_swizzle:            common_swizzle,
 -
 -      sys: { sio: {
 -              route_tab:      0x0b0a0e0f,
 +      .machine_check          = apecs_machine_check,
-       .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = APECS_AND_LCA_DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = 16,
 +      .device_interrupt       = isa_device_interrupt,
 +
 +      .init_arch              = apecs_init_arch,
 +      .init_irq               = sio_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = noname_init_pci,
 +      .pci_map_irq            = noname_map_irq,
 +      .pci_swizzle            = common_swizzle,
 +
 +      .sys = { .sio = {
 +              .route_tab      = 0x0b0a0e0f,
        }}
  };
  ALIAS_MV(avanti)
@@@ -317,22 -317,22 +317,22 @@@ struct alpha_machine_vector noname_mv _
        DO_DEFAULT_RTC,
        DO_LCA_IO,
        DO_LCA_BUS,
 -      machine_check:          lca_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        APECS_AND_LCA_DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                16,
 -      device_interrupt:       srm_device_interrupt,
 -
 -      init_arch:              lca_init_arch,
 -      init_irq:               sio_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               noname_init_pci,
 -      pci_map_irq:            noname_map_irq,
 -      pci_swizzle:            common_swizzle,
 -
 -      sys: { sio: {
 +      .machine_check          = lca_machine_check,
-       .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = APECS_AND_LCA_DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = 16,
 +      .device_interrupt       = srm_device_interrupt,
 +
 +      .init_arch              = lca_init_arch,
 +      .init_irq               = sio_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = noname_init_pci,
 +      .pci_map_irq            = noname_map_irq,
 +      .pci_swizzle            = common_swizzle,
 +
 +      .sys = { .sio = {
                /* For UDB, the only available PCI slot must not map to IRQ 9,
                   since that's the builtin MSS sound chip. That PCI slot
                   will map to PIRQ1 (for INTA at least), so we give it IRQ 15
@@@ -355,23 -355,23 +355,23 @@@ struct alpha_machine_vector p2k_mv __in
        DO_DEFAULT_RTC,
        DO_LCA_IO,
        DO_LCA_BUS,
 -      machine_check:          lca_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        APECS_AND_LCA_DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                16,
 -      device_interrupt:       srm_device_interrupt,
 -
 -      init_arch:              lca_init_arch,
 -      init_irq:               sio_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               noname_init_pci,
 -      pci_map_irq:            p2k_map_irq,
 -      pci_swizzle:            common_swizzle,
 -
 -      sys: { sio: {
 -              route_tab:      0x0b0a090f,
 +      .machine_check          = lca_machine_check,
-       .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = APECS_AND_LCA_DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = 16,
 +      .device_interrupt       = srm_device_interrupt,
 +
 +      .init_arch              = lca_init_arch,
 +      .init_irq               = sio_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = noname_init_pci,
 +      .pci_map_irq            = p2k_map_irq,
 +      .pci_swizzle            = common_swizzle,
 +
 +      .sys = { .sio = {
 +              .route_tab      = 0x0b0a090f,
        }}
  };
  ALIAS_MV(p2k)
@@@ -384,23 -384,23 +384,23 @@@ struct alpha_machine_vector xl_mv __ini
        DO_DEFAULT_RTC,
        DO_APECS_IO,
        BUS(apecs),
 -      machine_check:          apecs_machine_check,
 -      max_isa_dma_address:    ALPHA_XL_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        XL_DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                16,
 -      device_interrupt:       isa_device_interrupt,
 -
 -      init_arch:              apecs_init_arch,
 -      init_irq:               sio_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               noname_init_pci,
 -      pci_map_irq:            noname_map_irq,
 -      pci_swizzle:            common_swizzle,
 -
 -      sys: { sio: {
 -              route_tab:      0x0b0a090f,
 +      .machine_check          = apecs_machine_check,
-       .max_dma_address        = ALPHA_XL_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_XL_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = XL_DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = 16,
 +      .device_interrupt       = isa_device_interrupt,
 +
 +      .init_arch              = apecs_init_arch,
 +      .init_irq               = sio_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = noname_init_pci,
 +      .pci_map_irq            = noname_map_irq,
 +      .pci_swizzle            = common_swizzle,
 +
 +      .sys = { .sio = {
 +              .route_tab      = 0x0b0a090f,
        }}
  };
  ALIAS_MV(xl)

diff --cc arch/alpha/kernel/sys_sx164.c
index ebd4d89e8f5b887432ecd661bd01b06fb8fa288c,e4a2e22252cb8391a2b5882a868d94d8ef9e1db2..b00bdf20398965fdf1dcc2e71e29b23454dd49e2
--- 1/arch/alpha/kernel/sys_sx164.c
--- 2/arch/alpha/kernel/sys_sx164.c
+++ b/arch/alpha/kernel/sys_sx164.c
@@@ -159,21 -159,21 +159,21 @@@ struct alpha_machine_vector sx164_mv __
        DO_DEFAULT_RTC,
        DO_PYXIS_IO,
        DO_CIA_BUS,
 -      machine_check:          cia_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        DEFAULT_MEM_BASE,
 -      pci_dac_offset:         PYXIS_DAC_OFFSET,
 -
 -      nr_irqs:                48,
 -      device_interrupt:       pyxis_device_interrupt,
 -
 -      init_arch:              sx164_init_arch,
 -      init_irq:               sx164_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               sx164_init_pci,
 -      kill_arch:              NULL,
 -      pci_map_irq:            sx164_map_irq,
 -      pci_swizzle:            common_swizzle,
 +      .machine_check          = cia_machine_check,
-       .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = DEFAULT_MEM_BASE,
 +      .pci_dac_offset         = PYXIS_DAC_OFFSET,
 +
 +      .nr_irqs                = 48,
 +      .device_interrupt       = pyxis_device_interrupt,
 +
 +      .init_arch              = sx164_init_arch,
 +      .init_irq               = sx164_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = sx164_init_pci,
 +      .kill_arch              = NULL,
 +      .pci_map_irq            = sx164_map_irq,
 +      .pci_swizzle            = common_swizzle,
  };
  ALIAS_MV(sx164)

diff --cc arch/alpha/kernel/sys_takara.c
index 6159efaf6386d4f6b4329290ff807f6b90ce94ad,efc437690a43660e347adbc9bfde1155387a94ee..4b4344a253b5aabb7d84e3d4f9f728a8c3dd85b9
--- 1/arch/alpha/kernel/sys_takara.c
--- 2/arch/alpha/kernel/sys_takara.c
+++ b/arch/alpha/kernel/sys_takara.c
@@@ -274,20 -274,20 +274,20 @@@ struct alpha_machine_vector takara_mv _
        DO_DEFAULT_RTC,
        DO_CIA_IO,
        DO_CIA_BUS,
 -      machine_check:          cia_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        CIA_DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                128,
 -      device_interrupt:       takara_device_interrupt,
 -
 -      init_arch:              cia_init_arch,
 -      init_irq:               takara_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               takara_init_pci,
 -      kill_arch:              NULL,
 -      pci_map_irq:            takara_map_irq,
 -      pci_swizzle:            takara_swizzle,
 +      .machine_check          = cia_machine_check,
-       .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = CIA_DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = 128,
 +      .device_interrupt       = takara_device_interrupt,
 +
 +      .init_arch              = cia_init_arch,
 +      .init_irq               = takara_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = takara_init_pci,
 +      .kill_arch              = NULL,
 +      .pci_map_irq            = takara_map_irq,
 +      .pci_swizzle            = takara_swizzle,
  };
  ALIAS_MV(takara)

diff --cc arch/alpha/kernel/sys_titan.c
index fec4505fcc955b293c68de761734baef64857098,96e68d27f7ba88c0e779354d569ea9faa2c3596d..9fe6e89f89e94dd3ff107de25a23f26d7c862f30
--- 1/arch/alpha/kernel/sys_titan.c
--- 2/arch/alpha/kernel/sys_titan.c
+++ b/arch/alpha/kernel/sys_titan.c
@@@ -369,21 -372,21 +369,21 @@@ struct alpha_machine_vector privateer_m
        DO_DEFAULT_RTC,
        DO_TITAN_IO,
        DO_TITAN_BUS,
 -      machine_check:          privateer_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        DEFAULT_MEM_BASE,
 -      pci_dac_offset:         TITAN_DAC_OFFSET,
 -
 -      nr_irqs:                80,     /* 64 + 16 */
 -      device_interrupt:       privateer_device_interrupt,
 -
 -      init_arch:              titan_init_arch,
 -      init_irq:               privateer_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               privateer_init_pci,
 -      kill_arch:              titan_kill_arch,
 -      pci_map_irq:            privateer_map_irq,
 -      pci_swizzle:            common_swizzle,
 +      .machine_check          = privateer_machine_check,
-       .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = DEFAULT_MEM_BASE,
 +      .pci_dac_offset         = TITAN_DAC_OFFSET,
 +
 +      .nr_irqs                = 80,   /* 64 + 16 */
 +      .device_interrupt       = privateer_device_interrupt,
 +
 +      .init_arch              = titan_init_arch,
 +      .init_irq               = privateer_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = privateer_init_pci,
 +      .kill_arch              = titan_kill_arch,
 +      .pci_map_irq            = privateer_map_irq,
 +      .pci_swizzle            = common_swizzle,
  };
  ALIAS_MV(privateer)

diff --cc arch/alpha/kernel/sys_wildfire.c
index 90316b56980a45d3630c2512be7edff93b7a676d,d46a2e7d87b8ab9ce3fd1d4f15dd51863cf7c37d..0e8fa5959eedb9be43aac07333ca63538cc2258e
--- 1/arch/alpha/kernel/sys_wildfire.c
--- 2/arch/alpha/kernel/sys_wildfire.c
+++ b/arch/alpha/kernel/sys_wildfire.c
@@@ -338,20 -338,20 +338,20 @@@ struct alpha_machine_vector wildfire_m
        DO_DEFAULT_RTC,
        DO_WILDFIRE_IO,
        DO_WILDFIRE_BUS,
 -      machine_check:          wildfire_machine_check,
 -      max_isa_dma_address:    ALPHA_MAX_ISA_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                WILDFIRE_NR_IRQS,
 -      device_interrupt:       wildfire_device_interrupt,
 -
 -      init_arch:              wildfire_init_arch,
 -      init_irq:               wildfire_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               common_init_pci,
 -      kill_arch:              wildfire_kill_arch,
 -      pci_map_irq:            wildfire_map_irq,
 -      pci_swizzle:            common_swizzle,
 +      .machine_check          = wildfire_machine_check,
-       .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
++      .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = WILDFIRE_NR_IRQS,
 +      .device_interrupt       = wildfire_device_interrupt,
 +
 +      .init_arch              = wildfire_init_arch,
 +      .init_irq               = wildfire_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = common_init_pci,
 +      .kill_arch              = wildfire_kill_arch,
 +      .pci_map_irq            = wildfire_map_irq,
 +      .pci_swizzle            = common_swizzle,
  };
  ALIAS_MV(wildfire)