diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-16 20:56:49 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-16 20:56:49 -0800 |
commit | a1bc5cdf9f9550bd7e9e5d8400e95b164165b275 (patch) | |
tree | 3d4e80bb369675765e39450c55c6140e1213da81 /include/asm-ia64/sn/intr.h | |
parent | 8dca6f33f026dc8a7fc2710b78a7521e899bd611 (diff) | |
parent | 859538763155814d217054eb6e3cdff71bdb4d89 (diff) |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'include/asm-ia64/sn/intr.h')
-rw-r--r-- | include/asm-ia64/sn/intr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ia64/sn/intr.h b/include/asm-ia64/sn/intr.h index e35074f526d..a3431372c6e 100644 --- a/include/asm-ia64/sn/intr.h +++ b/include/asm-ia64/sn/intr.h @@ -40,7 +40,7 @@ struct sn_irq_info { int irq_cpuid; /* kernel logical cpuid */ int irq_irq; /* the IRQ number */ int irq_int_bit; /* Bridge interrupt pin */ - uint64_t irq_xtalkaddr; /* xtalkaddr IRQ is sent to */ + u64 irq_xtalkaddr; /* xtalkaddr IRQ is sent to */ int irq_bridge_type;/* pciio asic type (pciio.h) */ void *irq_bridge; /* bridge generating irq */ void *irq_pciioinfo; /* associated pciio_info_t */ |