git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'machtypes' into pxa-palm
[safe/jmp/linux-2.6]
/
arch
/
arm
/
mach-pxa
/
cm-x270.c
diff --git
a/arch/arm/mach-pxa/cm-x270.c
b/arch/arm/mach-pxa/cm-x270.c
index
b3c3fd7
..
01b9964
100644
(file)
--- a/
arch/arm/mach-pxa/cm-x270.c
+++ b/
arch/arm/mach-pxa/cm-x270.c
@@
-60,7
+60,7
@@
static struct resource cmx270_dm9k_resource[] = {
[2] = {
.start = CMX270_ETHIRQ,
.end = CMX270_ETHIRQ,
- .flags = IORESOURCE_IRQ,
+ .flags = IORESOURCE_IRQ
| IORESOURCE_IRQ_HIGHEDGE
,
}
};