summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sa1100/cerf.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-29 12:10:50 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-29 12:10:50 +0200
commit35780c8ea7ad5c6d5483244d5f5bf37176fda86a (patch)
tree2bc34969f558da2a9b3de915e3f2499a959085da /arch/arm/mach-sa1100/cerf.c
parent6ce37a58e334ef773f88283939afc9f4965c7697 (diff)
parent6e86841d05f371b5b9b86ce76c02aaee83352298 (diff)
downloadop-kernel-dev-35780c8ea7ad5c6d5483244d5f5bf37176fda86a.zip
op-kernel-dev-35780c8ea7ad5c6d5483244d5f5bf37176fda86a.tar.gz
Merge commit 'v2.6.27-rc1' into x86/urgent
Diffstat (limited to 'arch/arm/mach-sa1100/cerf.c')
-rw-r--r--arch/arm/mach-sa1100/cerf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/cerf.c b/arch/arm/mach-sa1100/cerf.c
index 31afe50..56d3ee0 100644
--- a/arch/arm/mach-sa1100/cerf.c
+++ b/arch/arm/mach-sa1100/cerf.c
@@ -96,7 +96,7 @@ static struct resource cerf_flash_resource = {
static void __init cerf_init_irq(void)
{
sa1100_init_irq();
- set_irq_type(CERF_ETH_IRQ, IRQT_RISING);
+ set_irq_type(CERF_ETH_IRQ, IRQ_TYPE_EDGE_RISING);
}
static struct map_desc cerf_io_desc[] __initdata = {
OpenPOWER on IntegriCloud