git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/battery-2.6
[pandora-kernel.git]
/
arch
/
ia64
/
include
/
asm
/
hw_irq.h
diff --git
a/arch/ia64/include/asm/hw_irq.h
b/arch/ia64/include/asm/hw_irq.h
index
5c99cbc
..
91619b3
100644
(file)
--- a/
arch/ia64/include/asm/hw_irq.h
+++ b/
arch/ia64/include/asm/hw_irq.h
@@
-106,7
+106,7
@@
extern struct irq_cfg irq_cfg[NR_IRQS];
#define irq_to_domain(x) irq_cfg[(x)].domain
DECLARE_PER_CPU(int[IA64_NUM_VECTORS], vector_irq);
#define irq_to_domain(x) irq_cfg[(x)].domain
DECLARE_PER_CPU(int[IA64_NUM_VECTORS], vector_irq);
-extern struct
hw_interrupt_type irq_type_ia64_lsapic;
/* CPU-internal interrupt controller */
+extern struct
irq_chip irq_type_ia64_lsapic;
/* CPU-internal interrupt controller */
#ifdef CONFIG_PARAVIRT_GUEST
#include <asm/paravirt.h>
#ifdef CONFIG_PARAVIRT_GUEST
#include <asm/paravirt.h>
@@
-146,7
+146,7
@@
static inline void ia64_native_resend_irq(unsigned int vector)
* Default implementations for the irq-descriptor API:
*/
* Default implementations for the irq-descriptor API:
*/
-extern
irq_desc_t
irq_desc[NR_IRQS];
+extern
struct irq_desc
irq_desc[NR_IRQS];
#ifndef CONFIG_IA64_GENERIC
static inline ia64_vector __ia64_irq_to_vector(int irq)
#ifndef CONFIG_IA64_GENERIC
static inline ia64_vector __ia64_irq_to_vector(int irq)