projects / openwrt / staging / jogo.git / blob
? search:


3d7f1679309adbc8371eba22379e637a210b0248
[openwrt/staging/jogo.git] / 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 --- /dev/null
46 +++ b/arch/arm/mach-ixp4xx/modules.builtin
47 @@ -0,0 +1,2 @@
48 +kernel/arch/arm/mach-ixp4xx/ixp4xx_qmgr.ko
49 +kernel/arch/arm/mach-ixp4xx/ixp4xx_npe.ko
50 --- a/arch/arm/mach-ixp4xx/pronghorn-setup.c
51 +++ b/arch/arm/mach-ixp4xx/pronghorn-setup.c
52 @@ -224,8 +224,6 @@ static void __init pronghorn_init(void)
53
54 MACHINE_START(PRONGHORN, "ADI Engineering Pronghorn")
55 /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
56 - .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
57 - .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
58 .map_io = ixp4xx_map_io,
59 .init_irq = ixp4xx_init_irq,
60 .timer = &ixp4xx_timer,
61 @@ -235,8 +233,6 @@ MACHINE_END
62
63 MACHINE_START(PRONGHORNMETRO, "ADI Engineering Pronghorn Metro")
64 /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
65 - .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
66 - .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
67 .map_io = ixp4xx_map_io,
68 .init_irq = ixp4xx_init_irq,
69 .timer = &ixp4xx_timer,
70 --- a/arch/arm/mach-ixp4xx/sidewinder-setup.c
71 +++ b/arch/arm/mach-ixp4xx/sidewinder-setup.c
72 @@ -139,8 +139,6 @@ static void __init sidewinder_init(void)
73
74 MACHINE_START(SIDEWINDER, "ADI Engineering Sidewinder")
75 /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
76 - .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
77 - .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
78 .map_io = ixp4xx_map_io,
79 .init_irq = ixp4xx_init_irq,
80 .timer = &ixp4xx_timer,
81 --- a/arch/arm/mach-ixp4xx/tw2662-setup.c
82 +++ b/arch/arm/mach-ixp4xx/tw2662-setup.c
83 @@ -200,8 +200,6 @@ static void __init tw2662_init(void)
84 #ifdef CONFIG_MACH_TW2662
85 MACHINE_START(TW2662, "Titan Wireless TW-266-2")
86 /* Maintainer: Alexandros C. Couloumbis <alex@ozo.com> */
87 - .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
88 - .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
89 .fixup = tw2662_fixup,
90 .map_io = ixp4xx_map_io,
91 .init_irq = ixp4xx_init_irq,
92 --- a/arch/arm/mach-ixp4xx/tw5334-setup.c
93 +++ b/arch/arm/mach-ixp4xx/tw5334-setup.c
94 @@ -152,8 +152,6 @@ static void __init tw5334_init(void)
95 #ifdef CONFIG_MACH_TW5334
96 MACHINE_START(TW5334, "Titan Wireless TW-533-4")
97 /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
98 - .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
99 - .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
100 .map_io = ixp4xx_map_io,
101 .init_irq = ixp4xx_init_irq,
102 .timer = &ixp4xx_timer,
103 --- a/arch/arm/mach-ixp4xx/usr8200-setup.c
104 +++ b/arch/arm/mach-ixp4xx/usr8200-setup.c
105 @@ -202,8 +202,6 @@ static void __init usr8200_init(void)
106
107 MACHINE_START(USR8200, "USRobotics USR8200")
108 /* Maintainer: Peter Denison <openwrt@marshadder.org> */
109 - .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
110 - .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
111 .map_io = ixp4xx_map_io,
112 .init_irq = ixp4xx_init_irq,
113 .timer = &ixp4xx_timer,
114 --- a/arch/arm/mach-ixp4xx/wg302v1-setup.c
115 +++ b/arch/arm/mach-ixp4xx/wg302v1-setup.c
116 @@ -161,8 +161,6 @@ static void __init wg302v1_init(void)
117 #ifdef CONFIG_MACH_WG302V1
118 MACHINE_START(WG302V1, "Netgear WG302 v1 / WAG302 v1")
119 /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
120 - .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
121 - .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
122 .fixup = wg302v1_fixup,
123 .map_io = ixp4xx_map_io,
124 .init_irq = ixp4xx_init_irq,
125 --- a/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
126 +++ b/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
127 @@ -157,8 +157,6 @@ static void __init wrt300nv2_init(void)
128 #ifdef CONFIG_MACH_WRT300NV2
129 MACHINE_START(WRT300NV2, "Linksys WRT300N v2")
130 /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
131 - .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
132 - .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
133 .map_io = ixp4xx_map_io,
134 .init_irq = ixp4xx_init_irq,
135 .timer = &ixp4xx_timer,
Staging tree of Jonas Gorski