diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-26 20:28:24 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-26 20:28:24 -0400 |
commit | 41b6c37326cb24efc86fba94bcaa37f2cc23f1cd (patch) | |
tree | e8a8be21d4eb613d65c1f6dfc125157c2568b86f /arch | |
parent | 5f6b5517bfcae217d52a7607b1bebc3a257f45d1 (diff) | |
parent | 26799e675e47c5aa3104628e2081a7299ea46557 (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-aaec2000/core.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/time.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-clps7500/core.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-ebsa110/core.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-epxa10db/time.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-footbridge/dc21285-timer.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-footbridge/isa-timer.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-h720x/cpu-h7201.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-h720x/cpu-h7202.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-imx/time.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-integrator/core.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-iop3xx/iop321-time.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop3xx/iop331-time.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp2000/core.c | 9 | ||||
-rw-r--r-- | arch/arm/mach-ixp2000/ixdp2800.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/common.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/time.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-omap/time.c | 10 | ||||
-rw-r--r-- | arch/arm/mach-pxa/time.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/time.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/h3600.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/time.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-shark/core.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-versatile/core.c | 4 |
24 files changed, 49 insertions, 50 deletions
diff --git a/arch/arm/mach-aaec2000/core.c b/arch/arm/mach-aaec2000/core.c index fc145b3768fa..aece0cd4f0a3 100644 --- a/arch/arm/mach-aaec2000/core.c +++ b/arch/arm/mach-aaec2000/core.c | |||
@@ -128,8 +128,8 @@ aaec2000_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
128 | 128 | ||
129 | static struct irqaction aaec2000_timer_irq = { | 129 | static struct irqaction aaec2000_timer_irq = { |
130 | .name = "AAEC-2000 Timer Tick", | 130 | .name = "AAEC-2000 Timer Tick", |
131 | .flags = SA_INTERRUPT, | 131 | .flags = SA_INTERRUPT | SA_TIMER, |
132 | .handler = aaec2000_timer_interrupt | 132 | .handler = aaec2000_timer_interrupt, |
133 | }; | 133 | }; |
134 | 134 | ||
135 | static void __init aaec2000_timer_init(void) | 135 | static void __init aaec2000_timer_init(void) |
diff --git a/arch/arm/mach-clps711x/time.c b/arch/arm/mach-clps711x/time.c index 383d4e0c6e35..1a23f0dcd4b8 100644 --- a/arch/arm/mach-clps711x/time.c +++ b/arch/arm/mach-clps711x/time.c | |||
@@ -57,8 +57,8 @@ p720t_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
57 | 57 | ||
58 | static struct irqaction clps711x_timer_irq = { | 58 | static struct irqaction clps711x_timer_irq = { |
59 | .name = "CLPS711x Timer Tick", | 59 | .name = "CLPS711x Timer Tick", |
60 | .flags = SA_INTERRUPT, | 60 | .flags = SA_INTERRUPT | SA_TIMER, |
61 | .handler = p720t_timer_interrupt | 61 | .handler = p720t_timer_interrupt, |
62 | }; | 62 | }; |
63 | 63 | ||
64 | static void __init clps711x_timer_init(void) | 64 | static void __init clps711x_timer_init(void) |
diff --git a/arch/arm/mach-clps7500/core.c b/arch/arm/mach-clps7500/core.c index 0bc7da488612..90e85f434f6f 100644 --- a/arch/arm/mach-clps7500/core.c +++ b/arch/arm/mach-clps7500/core.c | |||
@@ -298,8 +298,8 @@ clps7500_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
298 | 298 | ||
299 | static struct irqaction clps7500_timer_irq = { | 299 | static struct irqaction clps7500_timer_irq = { |
300 | .name = "CLPS7500 Timer Tick", | 300 | .name = "CLPS7500 Timer Tick", |
301 | .flags = SA_INTERRUPT, | 301 | .flags = SA_INTERRUPT | SA_TIMER, |
302 | .handler = clps7500_timer_interrupt | 302 | .handler = clps7500_timer_interrupt, |
303 | }; | 303 | }; |
304 | 304 | ||
305 | /* | 305 | /* |
diff --git a/arch/arm/mach-ebsa110/core.c b/arch/arm/mach-ebsa110/core.c index ef362d44949d..86ffdbb5626e 100644 --- a/arch/arm/mach-ebsa110/core.c +++ b/arch/arm/mach-ebsa110/core.c | |||
@@ -173,8 +173,8 @@ ebsa110_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
173 | 173 | ||
174 | static struct irqaction ebsa110_timer_irq = { | 174 | static struct irqaction ebsa110_timer_irq = { |
175 | .name = "EBSA110 Timer Tick", | 175 | .name = "EBSA110 Timer Tick", |
176 | .flags = SA_INTERRUPT, | 176 | .flags = SA_INTERRUPT | SA_TIMER, |
177 | .handler = ebsa110_timer_interrupt | 177 | .handler = ebsa110_timer_interrupt, |
178 | }; | 178 | }; |
179 | 179 | ||
180 | /* | 180 | /* |
diff --git a/arch/arm/mach-epxa10db/time.c b/arch/arm/mach-epxa10db/time.c index 1b991f3cc3c6..4b1084dde8dd 100644 --- a/arch/arm/mach-epxa10db/time.c +++ b/arch/arm/mach-epxa10db/time.c | |||
@@ -56,8 +56,8 @@ epxa10db_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
56 | 56 | ||
57 | static struct irqaction epxa10db_timer_irq = { | 57 | static struct irqaction epxa10db_timer_irq = { |
58 | .name = "Excalibur Timer Tick", | 58 | .name = "Excalibur Timer Tick", |
59 | .flags = SA_INTERRUPT, | 59 | .flags = SA_INTERRUPT | SA_TIMER, |
60 | .handler = epxa10db_timer_interrupt | 60 | .handler = epxa10db_timer_interrupt, |
61 | }; | 61 | }; |
62 | 62 | ||
63 | /* | 63 | /* |
diff --git a/arch/arm/mach-footbridge/dc21285-timer.c b/arch/arm/mach-footbridge/dc21285-timer.c index da5b9b7623ca..14a62d6008fe 100644 --- a/arch/arm/mach-footbridge/dc21285-timer.c +++ b/arch/arm/mach-footbridge/dc21285-timer.c | |||
@@ -43,7 +43,7 @@ timer1_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
43 | static struct irqaction footbridge_timer_irq = { | 43 | static struct irqaction footbridge_timer_irq = { |
44 | .name = "Timer1 timer tick", | 44 | .name = "Timer1 timer tick", |
45 | .handler = timer1_interrupt, | 45 | .handler = timer1_interrupt, |
46 | .flags = SA_INTERRUPT, | 46 | .flags = SA_INTERRUPT | SA_TIMER, |
47 | }; | 47 | }; |
48 | 48 | ||
49 | /* | 49 | /* |
diff --git a/arch/arm/mach-footbridge/isa-timer.c b/arch/arm/mach-footbridge/isa-timer.c index a4fefa0bb5a1..c1d74f7ab669 100644 --- a/arch/arm/mach-footbridge/isa-timer.c +++ b/arch/arm/mach-footbridge/isa-timer.c | |||
@@ -72,7 +72,7 @@ isa_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
72 | static struct irqaction isa_timer_irq = { | 72 | static struct irqaction isa_timer_irq = { |
73 | .name = "ISA timer tick", | 73 | .name = "ISA timer tick", |
74 | .handler = isa_timer_interrupt, | 74 | .handler = isa_timer_interrupt, |
75 | .flags = SA_INTERRUPT, | 75 | .flags = SA_INTERRUPT | SA_TIMER, |
76 | }; | 76 | }; |
77 | 77 | ||
78 | static void __init isa_timer_init(void) | 78 | static void __init isa_timer_init(void) |
diff --git a/arch/arm/mach-h720x/cpu-h7201.c b/arch/arm/mach-h720x/cpu-h7201.c index 743656881ed6..af9e4a5d5ea7 100644 --- a/arch/arm/mach-h720x/cpu-h7201.c +++ b/arch/arm/mach-h720x/cpu-h7201.c | |||
@@ -41,8 +41,8 @@ h7201_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
41 | 41 | ||
42 | static struct irqaction h7201_timer_irq = { | 42 | static struct irqaction h7201_timer_irq = { |
43 | .name = "h7201 Timer Tick", | 43 | .name = "h7201 Timer Tick", |
44 | .flags = SA_INTERRUPT, | 44 | .flags = SA_INTERRUPT | SA_TIMER, |
45 | .handler = h7201_timer_interrupt | 45 | .handler = h7201_timer_interrupt, |
46 | }; | 46 | }; |
47 | 47 | ||
48 | /* | 48 | /* |
diff --git a/arch/arm/mach-h720x/cpu-h7202.c b/arch/arm/mach-h720x/cpu-h7202.c index 21b8fb6122cd..593b6a2a30e1 100644 --- a/arch/arm/mach-h720x/cpu-h7202.c +++ b/arch/arm/mach-h720x/cpu-h7202.c | |||
@@ -171,8 +171,8 @@ static struct irqchip h7202_timerx_chip = { | |||
171 | 171 | ||
172 | static struct irqaction h7202_timer_irq = { | 172 | static struct irqaction h7202_timer_irq = { |
173 | .name = "h7202 Timer Tick", | 173 | .name = "h7202 Timer Tick", |
174 | .flags = SA_INTERRUPT, | 174 | .flags = SA_INTERRUPT | SA_TIMER, |
175 | .handler = h7202_timer_interrupt | 175 | .handler = h7202_timer_interrupt, |
176 | }; | 176 | }; |
177 | 177 | ||
178 | /* | 178 | /* |
diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c index 11f1e56c36bc..ea805bfa5e54 100644 --- a/arch/arm/mach-imx/time.c +++ b/arch/arm/mach-imx/time.c | |||
@@ -72,8 +72,8 @@ imx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
72 | 72 | ||
73 | static struct irqaction imx_timer_irq = { | 73 | static struct irqaction imx_timer_irq = { |
74 | .name = "i.MX Timer Tick", | 74 | .name = "i.MX Timer Tick", |
75 | .flags = SA_INTERRUPT, | 75 | .flags = SA_INTERRUPT | SA_TIMER, |
76 | .handler = imx_timer_interrupt | 76 | .handler = imx_timer_interrupt, |
77 | }; | 77 | }; |
78 | 78 | ||
79 | /* | 79 | /* |
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c index bd1e5e3c9d34..9222e57bd872 100644 --- a/arch/arm/mach-integrator/core.c +++ b/arch/arm/mach-integrator/core.c | |||
@@ -247,8 +247,8 @@ integrator_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
247 | 247 | ||
248 | static struct irqaction integrator_timer_irq = { | 248 | static struct irqaction integrator_timer_irq = { |
249 | .name = "Integrator Timer Tick", | 249 | .name = "Integrator Timer Tick", |
250 | .flags = SA_INTERRUPT, | 250 | .flags = SA_INTERRUPT | SA_TIMER, |
251 | .handler = integrator_timer_interrupt | 251 | .handler = integrator_timer_interrupt, |
252 | }; | 252 | }; |
253 | 253 | ||
254 | /* | 254 | /* |
diff --git a/arch/arm/mach-iop3xx/iop321-time.c b/arch/arm/mach-iop3xx/iop321-time.c index 9b7dd64d1b8f..d53af1669502 100644 --- a/arch/arm/mach-iop3xx/iop321-time.c +++ b/arch/arm/mach-iop3xx/iop321-time.c | |||
@@ -86,7 +86,7 @@ iop321_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
86 | static struct irqaction iop321_timer_irq = { | 86 | static struct irqaction iop321_timer_irq = { |
87 | .name = "IOP321 Timer Tick", | 87 | .name = "IOP321 Timer Tick", |
88 | .handler = iop321_timer_interrupt, | 88 | .handler = iop321_timer_interrupt, |
89 | .flags = SA_INTERRUPT | 89 | .flags = SA_INTERRUPT | SA_TIMER, |
90 | }; | 90 | }; |
91 | 91 | ||
92 | static void __init iop321_timer_init(void) | 92 | static void __init iop321_timer_init(void) |
diff --git a/arch/arm/mach-iop3xx/iop331-time.c b/arch/arm/mach-iop3xx/iop331-time.c index e01696769263..1a6d9d661e4b 100644 --- a/arch/arm/mach-iop3xx/iop331-time.c +++ b/arch/arm/mach-iop3xx/iop331-time.c | |||
@@ -83,7 +83,7 @@ iop331_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
83 | static struct irqaction iop331_timer_irq = { | 83 | static struct irqaction iop331_timer_irq = { |
84 | .name = "IOP331 Timer Tick", | 84 | .name = "IOP331 Timer Tick", |
85 | .handler = iop331_timer_interrupt, | 85 | .handler = iop331_timer_interrupt, |
86 | .flags = SA_INTERRUPT | 86 | .flags = SA_INTERRUPT | SA_TIMER, |
87 | }; | 87 | }; |
88 | 88 | ||
89 | static void __init iop331_timer_init(void) | 89 | static void __init iop331_timer_init(void) |
diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c index 0ee34acb8d7b..4b9d841e04c1 100644 --- a/arch/arm/mach-ixp2000/core.c +++ b/arch/arm/mach-ixp2000/core.c | |||
@@ -103,6 +103,11 @@ static struct map_desc ixp2000_io_desc[] __initdata = { | |||
103 | .length = IXP2000_PCI_CSR_SIZE, | 103 | .length = IXP2000_PCI_CSR_SIZE, |
104 | .type = MT_DEVICE | 104 | .type = MT_DEVICE |
105 | }, { | 105 | }, { |
106 | .virtual = IXP2000_MSF_VIRT_BASE, | ||
107 | .physical = IXP2000_MSF_PHYS_BASE, | ||
108 | .length = IXP2000_MSF_SIZE, | ||
109 | .type = MT_DEVICE | ||
110 | }, { | ||
106 | .virtual = IXP2000_PCI_IO_VIRT_BASE, | 111 | .virtual = IXP2000_PCI_IO_VIRT_BASE, |
107 | .physical = IXP2000_PCI_IO_PHYS_BASE, | 112 | .physical = IXP2000_PCI_IO_PHYS_BASE, |
108 | .length = IXP2000_PCI_IO_SIZE, | 113 | .length = IXP2000_PCI_IO_SIZE, |
@@ -194,8 +199,8 @@ static int ixp2000_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
194 | 199 | ||
195 | static struct irqaction ixp2000_timer_irq = { | 200 | static struct irqaction ixp2000_timer_irq = { |
196 | .name = "IXP2000 Timer Tick", | 201 | .name = "IXP2000 Timer Tick", |
197 | .flags = SA_INTERRUPT, | 202 | .flags = SA_INTERRUPT | SA_TIMER, |
198 | .handler = ixp2000_timer_interrupt | 203 | .handler = ixp2000_timer_interrupt, |
199 | }; | 204 | }; |
200 | 205 | ||
201 | void __init ixp2000_init_time(unsigned long tick_rate) | 206 | void __init ixp2000_init_time(unsigned long tick_rate) |
diff --git a/arch/arm/mach-ixp2000/ixdp2800.c b/arch/arm/mach-ixp2000/ixdp2800.c index aec13c7108a9..468a4bbfb724 100644 --- a/arch/arm/mach-ixp2000/ixdp2800.c +++ b/arch/arm/mach-ixp2000/ixdp2800.c | |||
@@ -42,12 +42,6 @@ | |||
42 | #include <asm/mach/flash.h> | 42 | #include <asm/mach/flash.h> |
43 | #include <asm/mach/arch.h> | 43 | #include <asm/mach/arch.h> |
44 | 44 | ||
45 | |||
46 | void ixdp2400_init_irq(void) | ||
47 | { | ||
48 | ixdp2x00_init_irq(IXDP2800_CPLD_INT_STAT, IXDP2800_CPLD_INT_MASK, IXDP2400_NR_IRQS); | ||
49 | } | ||
50 | |||
51 | /************************************************************************* | 45 | /************************************************************************* |
52 | * IXDP2800 timer tick | 46 | * IXDP2800 timer tick |
53 | *************************************************************************/ | 47 | *************************************************************************/ |
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c index f39e8408488f..04490a9f8f6e 100644 --- a/arch/arm/mach-ixp4xx/common.c +++ b/arch/arm/mach-ixp4xx/common.c | |||
@@ -298,8 +298,8 @@ static irqreturn_t ixp4xx_timer_interrupt(int irq, void *dev_id, struct pt_regs | |||
298 | 298 | ||
299 | static struct irqaction ixp4xx_timer_irq = { | 299 | static struct irqaction ixp4xx_timer_irq = { |
300 | .name = "IXP4xx Timer Tick", | 300 | .name = "IXP4xx Timer Tick", |
301 | .flags = SA_INTERRUPT, | 301 | .flags = SA_INTERRUPT | SA_TIMER, |
302 | .handler = ixp4xx_timer_interrupt | 302 | .handler = ixp4xx_timer_interrupt, |
303 | }; | 303 | }; |
304 | 304 | ||
305 | static void __init ixp4xx_timer_init(void) | 305 | static void __init ixp4xx_timer_init(void) |
diff --git a/arch/arm/mach-lh7a40x/time.c b/arch/arm/mach-lh7a40x/time.c index 51e1c814b400..be377e331f25 100644 --- a/arch/arm/mach-lh7a40x/time.c +++ b/arch/arm/mach-lh7a40x/time.c | |||
@@ -53,8 +53,8 @@ lh7a40x_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
53 | 53 | ||
54 | static struct irqaction lh7a40x_timer_irq = { | 54 | static struct irqaction lh7a40x_timer_irq = { |
55 | .name = "LHA740x Timer Tick", | 55 | .name = "LHA740x Timer Tick", |
56 | .flags = SA_INTERRUPT, | 56 | .flags = SA_INTERRUPT | SA_TIMER, |
57 | .handler = lh7a40x_timer_interrupt | 57 | .handler = lh7a40x_timer_interrupt, |
58 | }; | 58 | }; |
59 | 59 | ||
60 | static void __init lh7a40x_timer_init(void) | 60 | static void __init lh7a40x_timer_init(void) |
diff --git a/arch/arm/mach-omap/time.c b/arch/arm/mach-omap/time.c index 4205fdcb632c..589e8b2740dd 100644 --- a/arch/arm/mach-omap/time.c +++ b/arch/arm/mach-omap/time.c | |||
@@ -188,8 +188,8 @@ static irqreturn_t omap_mpu_timer_interrupt(int irq, void *dev_id, | |||
188 | 188 | ||
189 | static struct irqaction omap_mpu_timer_irq = { | 189 | static struct irqaction omap_mpu_timer_irq = { |
190 | .name = "mpu timer", | 190 | .name = "mpu timer", |
191 | .flags = SA_INTERRUPT, | 191 | .flags = SA_INTERRUPT | SA_TIMER, |
192 | .handler = omap_mpu_timer_interrupt | 192 | .handler = omap_mpu_timer_interrupt, |
193 | }; | 193 | }; |
194 | 194 | ||
195 | static unsigned long omap_mpu_timer1_overflows; | 195 | static unsigned long omap_mpu_timer1_overflows; |
@@ -203,7 +203,7 @@ static irqreturn_t omap_mpu_timer1_interrupt(int irq, void *dev_id, | |||
203 | static struct irqaction omap_mpu_timer1_irq = { | 203 | static struct irqaction omap_mpu_timer1_irq = { |
204 | .name = "mpu timer1 overflow", | 204 | .name = "mpu timer1 overflow", |
205 | .flags = SA_INTERRUPT, | 205 | .flags = SA_INTERRUPT, |
206 | .handler = omap_mpu_timer1_interrupt | 206 | .handler = omap_mpu_timer1_interrupt, |
207 | }; | 207 | }; |
208 | 208 | ||
209 | static __init void omap_init_mpu_timer(void) | 209 | static __init void omap_init_mpu_timer(void) |
@@ -349,8 +349,8 @@ static irqreturn_t omap_32k_timer_interrupt(int irq, void *dev_id, | |||
349 | 349 | ||
350 | static struct irqaction omap_32k_timer_irq = { | 350 | static struct irqaction omap_32k_timer_irq = { |
351 | .name = "32KHz timer", | 351 | .name = "32KHz timer", |
352 | .flags = SA_INTERRUPT, | 352 | .flags = SA_INTERRUPT | SA_TIMER, |
353 | .handler = omap_32k_timer_interrupt | 353 | .handler = omap_32k_timer_interrupt, |
354 | }; | 354 | }; |
355 | 355 | ||
356 | static __init void omap_init_32k_timer(void) | 356 | static __init void omap_init_32k_timer(void) |
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c index 473fb6173f72..6e5202154f91 100644 --- a/arch/arm/mach-pxa/time.c +++ b/arch/arm/mach-pxa/time.c | |||
@@ -105,8 +105,8 @@ pxa_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
105 | 105 | ||
106 | static struct irqaction pxa_timer_irq = { | 106 | static struct irqaction pxa_timer_irq = { |
107 | .name = "PXA Timer Tick", | 107 | .name = "PXA Timer Tick", |
108 | .flags = SA_INTERRUPT, | 108 | .flags = SA_INTERRUPT | SA_TIMER, |
109 | .handler = pxa_timer_interrupt | 109 | .handler = pxa_timer_interrupt, |
110 | }; | 110 | }; |
111 | 111 | ||
112 | static void __init pxa_timer_init(void) | 112 | static void __init pxa_timer_init(void) |
diff --git a/arch/arm/mach-s3c2410/time.c b/arch/arm/mach-s3c2410/time.c index 179f0e031af4..765a3a9ae032 100644 --- a/arch/arm/mach-s3c2410/time.c +++ b/arch/arm/mach-s3c2410/time.c | |||
@@ -137,8 +137,8 @@ s3c2410_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
137 | 137 | ||
138 | static struct irqaction s3c2410_timer_irq = { | 138 | static struct irqaction s3c2410_timer_irq = { |
139 | .name = "S3C2410 Timer Tick", | 139 | .name = "S3C2410 Timer Tick", |
140 | .flags = SA_INTERRUPT, | 140 | .flags = SA_INTERRUPT | SA_TIMER, |
141 | .handler = s3c2410_timer_interrupt | 141 | .handler = s3c2410_timer_interrupt, |
142 | }; | 142 | }; |
143 | 143 | ||
144 | /* | 144 | /* |
diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c index 84c86543501a..65dbe991426d 100644 --- a/arch/arm/mach-sa1100/h3600.c +++ b/arch/arm/mach-sa1100/h3600.c | |||
@@ -727,7 +727,7 @@ static void h3800_IRQ_demux(unsigned int irq, struct irqdesc *desc, struct pt_re | |||
727 | static struct irqaction h3800_irq = { | 727 | static struct irqaction h3800_irq = { |
728 | .name = "h3800_asic", | 728 | .name = "h3800_asic", |
729 | .handler = h3800_IRQ_demux, | 729 | .handler = h3800_IRQ_demux, |
730 | .flags = SA_INTERRUPT, | 730 | .flags = SA_INTERRUPT | SA_TIMER, |
731 | }; | 731 | }; |
732 | 732 | ||
733 | u32 kpio_int_shadow = 0; | 733 | u32 kpio_int_shadow = 0; |
diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c index 19b0c0fd6377..0eeb3616ffea 100644 --- a/arch/arm/mach-sa1100/time.c +++ b/arch/arm/mach-sa1100/time.c | |||
@@ -99,8 +99,8 @@ sa1100_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
99 | 99 | ||
100 | static struct irqaction sa1100_timer_irq = { | 100 | static struct irqaction sa1100_timer_irq = { |
101 | .name = "SA11xx Timer Tick", | 101 | .name = "SA11xx Timer Tick", |
102 | .flags = SA_INTERRUPT, | 102 | .flags = SA_INTERRUPT | SA_TIMER, |
103 | .handler = sa1100_timer_interrupt | 103 | .handler = sa1100_timer_interrupt, |
104 | }; | 104 | }; |
105 | 105 | ||
106 | static void __init sa1100_timer_init(void) | 106 | static void __init sa1100_timer_init(void) |
diff --git a/arch/arm/mach-shark/core.c b/arch/arm/mach-shark/core.c index a9bc5d0dbd85..aa0e2f6e02f6 100644 --- a/arch/arm/mach-shark/core.c +++ b/arch/arm/mach-shark/core.c | |||
@@ -84,8 +84,8 @@ shark_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
84 | 84 | ||
85 | static struct irqaction shark_timer_irq = { | 85 | static struct irqaction shark_timer_irq = { |
86 | .name = "Shark Timer Tick", | 86 | .name = "Shark Timer Tick", |
87 | .flags = SA_INTERRUPT, | 87 | .flags = SA_INTERRUPT | SA_TIMER, |
88 | .handler = shark_timer_interrupt | 88 | .handler = shark_timer_interrupt, |
89 | }; | 89 | }; |
90 | 90 | ||
91 | /* | 91 | /* |
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c index 6a7cbea5e098..9d1f2253e987 100644 --- a/arch/arm/mach-versatile/core.c +++ b/arch/arm/mach-versatile/core.c | |||
@@ -875,8 +875,8 @@ static irqreturn_t versatile_timer_interrupt(int irq, void *dev_id, struct pt_re | |||
875 | 875 | ||
876 | static struct irqaction versatile_timer_irq = { | 876 | static struct irqaction versatile_timer_irq = { |
877 | .name = "Versatile Timer Tick", | 877 | .name = "Versatile Timer Tick", |
878 | .flags = SA_INTERRUPT, | 878 | .flags = SA_INTERRUPT | SA_TIMER, |
879 | .handler = versatile_timer_interrupt | 879 | .handler = versatile_timer_interrupt, |
880 | }; | 880 | }; |
881 | 881 | ||
882 | /* | 882 | /* |