diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:15:58 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:15:58 -0400 |
| commit | e765ee90da62535ac7d7a97f2464f9646539d683 (patch) | |
| tree | 7a9cecce5aab958938e9a3bf46c2302d6af1958c /arch/arm/mach-pxa/em-x270.c | |
| parent | a4500b84c51645bbc86be3ca84f2252b7ada060f (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into tracing/ftrace
Diffstat (limited to 'arch/arm/mach-pxa/em-x270.c')
| -rw-r--r-- | arch/arm/mach-pxa/em-x270.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c index edc4f07a230d..9c57700ee5c2 100644 --- a/arch/arm/mach-pxa/em-x270.c +++ b/arch/arm/mach-pxa/em-x270.c | |||
| @@ -50,7 +50,7 @@ static struct resource em_x270_dm9k_resource[] = { | |||
| 50 | [2] = { | 50 | [2] = { |
| 51 | .start = EM_X270_ETHIRQ, | 51 | .start = EM_X270_ETHIRQ, |
| 52 | .end = EM_X270_ETHIRQ, | 52 | .end = EM_X270_ETHIRQ, |
| 53 | .flags = IORESOURCE_IRQ, | 53 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE, |
| 54 | } | 54 | } |
| 55 | }; | 55 | }; |
| 56 | 56 | ||