diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:20:28 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:20:28 -0400 |
commit | faeca31d068090285b77c39574d2bda14b079c50 (patch) | |
tree | 789841a7f0d336b24a74f2191542a2eb8177c8fa /arch/arm/mach-pxa/cm-x270.c | |
parent | 499f8f84b8324ba27d756e03f373fa16eeed9ccc (diff) | |
parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) |
Merge branch 'linus' into x86/pat
Diffstat (limited to 'arch/arm/mach-pxa/cm-x270.c')
-rw-r--r-- | arch/arm/mach-pxa/cm-x270.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c index 6d4416a4f378..f5851d1adc25 100644 --- a/arch/arm/mach-pxa/cm-x270.c +++ b/arch/arm/mach-pxa/cm-x270.c | |||
@@ -59,7 +59,7 @@ static struct resource cmx270_dm9k_resource[] = { | |||
59 | [2] = { | 59 | [2] = { |
60 | .start = CMX270_ETHIRQ, | 60 | .start = CMX270_ETHIRQ, |
61 | .end = CMX270_ETHIRQ, | 61 | .end = CMX270_ETHIRQ, |
62 | .flags = IORESOURCE_IRQ, | 62 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE, |
63 | } | 63 | } |
64 | }; | 64 | }; |
65 | 65 | ||