target/linux/ixp4xx/patches-2.6.37/601_arm_2.6.37_update.patch

   1 --- a/arch/arm/mach-ixp4xx/ap1000-setup.c
   2 +++ b/arch/arm/mach-ixp4xx/ap1000-setup.c
   3 @@ -167,8 +167,6 @@ static void __init ap1000_init(void)
   4  #ifdef CONFIG_MACH_AP1000
   5  MACHINE_START(AP1000, "Lanready AP-1000")
   6         /* Maintainer: Imre Kaloz <Kaloz@openwrt.org> */
   7 -       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
   8 -       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
   9         .fixup          = ap1000_fixup,
  10         .map_io         = ixp4xx_map_io,
  11         .init_irq       = ixp4xx_init_irq,
  12 --- a/arch/arm/mach-ixp4xx/cambria-setup.c
  13 +++ b/arch/arm/mach-ixp4xx/cambria-setup.c
  14 @@ -563,8 +563,6 @@ late_initcall(cambria_model_setup);
  15
  16  MACHINE_START(CAMBRIA, "Gateworks Cambria series")
  17         /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
  18 -       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
  19 -       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
  20         .map_io         = ixp4xx_map_io,
  21         .init_irq       = ixp4xx_init_irq,
  22         .timer          = &ixp4xx_timer,
  23 --- a/arch/arm/mach-ixp4xx/compex-setup.c
  24 +++ b/arch/arm/mach-ixp4xx/compex-setup.c
  25 @@ -126,8 +126,6 @@ static void __init compex_init(void)
  26
  27  MACHINE_START(COMPEX, "Compex WP18 / NP18A")
  28         /* Maintainer: Imre Kaloz <Kaloz@openwrt.org> */
  29 -       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
  30 -       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
  31         .map_io         = ixp4xx_map_io,
  32         .init_irq       = ixp4xx_init_irq,
  33         .timer          = &ixp4xx_timer,
  34 --- a/arch/arm/mach-ixp4xx/mi424wr-setup.c
  35 +++ b/arch/arm/mach-ixp4xx/mi424wr-setup.c
  36 @@ -333,8 +333,6 @@ static void __init mi424wr_init(void)
  37
  38  MACHINE_START(MI424WR, "Actiontec MI424WR")
  39         /* Maintainer: Jose Vasconcellos */
  40 -       .phys_io        = IXP4XX_UART2_BASE_PHYS,
  41 -       .io_pg_offst    = ((IXP4XX_UART2_BASE_VIRT) >> 18) & 0xfffc,
  42         .map_io         = ixp4xx_map_io,
  43         .init_irq       = ixp4xx_init_irq,
  44         .timer          = &ixp4xx_timer,
  45 --- a/arch/arm/mach-ixp4xx/pronghorn-setup.c
  46 +++ b/arch/arm/mach-ixp4xx/pronghorn-setup.c
  47 @@ -224,8 +224,6 @@ static void __init pronghorn_init(void)
  48
  49  MACHINE_START(PRONGHORN, "ADI Engineering Pronghorn")
  50         /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
  51 -       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
  52 -       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
  53         .map_io         = ixp4xx_map_io,
  54         .init_irq       = ixp4xx_init_irq,
  55         .timer          = &ixp4xx_timer,
  56 @@ -235,8 +233,6 @@ MACHINE_END
  57
  58  MACHINE_START(PRONGHORNMETRO, "ADI Engineering Pronghorn Metro")
  59         /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
  60 -       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
  61 -       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
  62         .map_io         = ixp4xx_map_io,
  63         .init_irq       = ixp4xx_init_irq,
  64         .timer          = &ixp4xx_timer,
  65 --- a/arch/arm/mach-ixp4xx/sidewinder-setup.c
  66 +++ b/arch/arm/mach-ixp4xx/sidewinder-setup.c
  67 @@ -139,8 +139,6 @@ static void __init sidewinder_init(void)
  68
  69  MACHINE_START(SIDEWINDER, "ADI Engineering Sidewinder")
  70         /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
  71 -       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
  72 -       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
  73         .map_io         = ixp4xx_map_io,
  74         .init_irq       = ixp4xx_init_irq,
  75         .timer          = &ixp4xx_timer,
  76 --- a/arch/arm/mach-ixp4xx/tw2662-setup.c
  77 +++ b/arch/arm/mach-ixp4xx/tw2662-setup.c
  78 @@ -200,8 +200,6 @@ static void __init tw2662_init(void)
  79  #ifdef CONFIG_MACH_TW2662
  80  MACHINE_START(TW2662, "Titan Wireless TW-266-2")
  81         /* Maintainer: Alexandros C. Couloumbis <alex@ozo.com> */
  82 -       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
  83 -       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
  84         .fixup          = tw2662_fixup,
  85         .map_io         = ixp4xx_map_io,
  86         .init_irq       = ixp4xx_init_irq,
  87 --- a/arch/arm/mach-ixp4xx/tw5334-setup.c
  88 +++ b/arch/arm/mach-ixp4xx/tw5334-setup.c
  89 @@ -152,8 +152,6 @@ static void __init tw5334_init(void)
  90  #ifdef CONFIG_MACH_TW5334
  91  MACHINE_START(TW5334, "Titan Wireless TW-533-4")
  92         /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
  93 -       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
  94 -       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
  95         .map_io         = ixp4xx_map_io,
  96         .init_irq       = ixp4xx_init_irq,
  97         .timer          = &ixp4xx_timer,
  98 --- a/arch/arm/mach-ixp4xx/usr8200-setup.c
  99 +++ b/arch/arm/mach-ixp4xx/usr8200-setup.c
 100 @@ -202,8 +202,6 @@ static void __init usr8200_init(void)
 101
 102  MACHINE_START(USR8200, "USRobotics USR8200")
 103         /* Maintainer: Peter Denison <openwrt@marshadder.org> */
 104 -       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
 105 -       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
 106         .map_io         = ixp4xx_map_io,
 107         .init_irq       = ixp4xx_init_irq,
 108         .timer          = &ixp4xx_timer,
 109 --- a/arch/arm/mach-ixp4xx/wg302v1-setup.c
 110 +++ b/arch/arm/mach-ixp4xx/wg302v1-setup.c
 111 @@ -161,8 +161,6 @@ static void __init wg302v1_init(void)
 112  #ifdef CONFIG_MACH_WG302V1
 113  MACHINE_START(WG302V1, "Netgear WG302 v1 / WAG302 v1")
 114         /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
 115 -       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
 116 -       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
 117         .fixup          = wg302v1_fixup,
 118         .map_io         = ixp4xx_map_io,
 119         .init_irq       = ixp4xx_init_irq,
 120 --- a/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
 121 +++ b/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
 122 @@ -157,8 +157,6 @@ static void __init wrt300nv2_init(void)
 123  #ifdef CONFIG_MACH_WRT300NV2
 124  MACHINE_START(WRT300NV2, "Linksys WRT300N v2")
 125         /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
 126 -       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
 127 -       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
 128         .map_io         = ixp4xx_map_io,
 129         .init_irq       = ixp4xx_init_irq,
 130         .timer          = &ixp4xx_timer,