shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of 10.10.10.201:/home/rockchip/rk2818/kernel into develop

Browse Source
This commit is contained in:
swj
2010-07-28 06:20:23 -07:00
parent 3b3c49cda7 2bb4bce184
commit a9dbad035b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/dm9000.c
View File

@@ -1228,8 +1228,13 @@ dm9000_open(struct net_device *dev)
irqflags |= IRQF_SHARED;
if (request_irq(dev->irq, &dm9000_interrupt, irqflags, dev->name, dev))
#ifndef CONFIG_MACH_RK2818MID
if (request_irq(dev->irq, dm9000_interrupt, IRQF_TRIGGER_HIGH, dev->name, dev))
return -EAGAIN;
#else
if (request_irq(dev->irq, dm9000_interrupt, irqflags, dev->name, dev))
return -EAGAIN;
#endif
/* Initialize DM9000 board */
dm9000_reset(db);