diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-12 11:27:22 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-12 11:27:22 +0200 |
| commit | bb6dfb32f90094fea647e1f27d994a8b6ddd2766 (patch) | |
| tree | e63681727543bcc3251bbc82b81a9cc822cc3f5e /arch/arm/mach-pxa/colibri.c | |
| parent | 4f384f8bcdb5d618a0a68fb84c809e602c798b8f (diff) | |
| parent | 5e70b7f3c24468bb1635b295945edb48ecd9656a (diff) | |
| download | kernel_samsung_smdk4412-bb6dfb32f90094fea647e1f27d994a8b6ddd2766.zip kernel_samsung_smdk4412-bb6dfb32f90094fea647e1f27d994a8b6ddd2766.tar.gz kernel_samsung_smdk4412-bb6dfb32f90094fea647e1f27d994a8b6ddd2766.tar.bz2 | |
Merge branch 'linus' into x86/gart
Diffstat (limited to 'arch/arm/mach-pxa/colibri.c')
| -rw-r--r-- | arch/arm/mach-pxa/colibri.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/colibri.c b/arch/arm/mach-pxa/colibri.c index 43bf5a1..574839d 100644 --- a/arch/arm/mach-pxa/colibri.c +++ b/arch/arm/mach-pxa/colibri.c @@ -98,7 +98,7 @@ static struct resource dm9000_resources[] = { [2] = { .start = COLIBRI_ETH_IRQ, .end = COLIBRI_ETH_IRQ, - .flags = IORESOURCE_IRQ, + .flags = IORESOURCE_IRQ | IRQF_TRIGGER_RISING, }, }; @@ -119,7 +119,6 @@ static void __init colibri_init(void) /* DM9000 LAN */ pxa_gpio_mode(GPIO78_nCS_2_MD); pxa_gpio_mode(GPIO_DM9000 | GPIO_IN); - set_irq_type(COLIBRI_ETH_IRQ, IRQT_FALLING); platform_add_devices(colibri_devices, ARRAY_SIZE(colibri_devices)); } |