git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'clk' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux...
[pandora-kernel.git]
/
arch
/
blackfin
/
mach-bf537
/
boards
/
cm_bf537e.c
diff --git
a/arch/blackfin/mach-bf537/boards/cm_bf537e.c
b/arch/blackfin/mach-bf537/boards/cm_bf537e.c
index
44fd840
..
9fb20d6
100644
(file)
--- a/
arch/blackfin/mach-bf537/boards/cm_bf537e.c
+++ b/
arch/blackfin/mach-bf537/boards/cm_bf537e.c
@@
-605,7
+605,7
@@
static struct platform_device bfin_mac_device = {
static struct pata_platform_info bfin_pata_platform_data = {
.ioport_shift = 2,
- .irq_type = IRQF_TRIGGER_HIGH
| IRQF_DISABLED
,
+ .irq_type = IRQF_TRIGGER_HIGH,
};
static struct resource bfin_pata_resources[] = {