diff options
author | 2006-03-22 11:02:08 +0100 | |
---|---|---|
committer | 2006-03-22 11:02:08 +0100 | |
commit | 5501972e0b5857bc8354770d900ceb9b40c7f6b7 (patch) | |
tree | ff239422827c4cd54d2998f8851304255de31b38 /include/asm-arm | |
parent | [PATCH] Intruduce DMA_28BIT_MASK (diff) | |
parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/... (diff) | |
download | linux-5501972e0b5857bc8354770d900ceb9b40c7f6b7.tar.gz linux-5501972e0b5857bc8354770d900ceb9b40c7f6b7.tar.bz2 linux-5501972e0b5857bc8354770d900ceb9b40c7f6b7.zip |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-arm')
-rw-r--r-- | include/asm-arm/irq.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/irq.h b/include/asm-arm/irq.h index 7772432d3fd7..60b5105c9c93 100644 --- a/include/asm-arm/irq.h +++ b/include/asm-arm/irq.h @@ -27,7 +27,7 @@ extern void enable_irq(unsigned int); /* * These correspond with the SA_TRIGGER_* defines, and therefore the - * IRQRESOURCE_IRQ_* defines. + * IORESOURCE_IRQ_* defines. */ #define __IRQT_RISEDGE (1 << 0) #define __IRQT_FALEDGE (1 << 1) |