diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-19 22:17:35 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-19 22:17:35 -0500 |
| commit | da935c66bacb3ed9ada984b053297f87c2dff63a (patch) | |
| tree | 46278da2b312c73f1375b830d7e5912bf23abd78 /arch/m68knommu/platform/68360/commproc.c | |
| parent | 9435eb1cf0b76b323019cebf8d16762a50a12a19 (diff) | |
| parent | 2205a6ea93fea76f88b43727fea53f3ce3790d6f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/e1000e/netdev.c
net/xfrm/xfrm_policy.c
Diffstat (limited to 'arch/m68knommu/platform/68360/commproc.c')
| -rw-r--r-- | arch/m68knommu/platform/68360/commproc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68knommu/platform/68360/commproc.c b/arch/m68knommu/platform/68360/commproc.c index f27e688c404e..8e4e10cc0080 100644 --- a/arch/m68knommu/platform/68360/commproc.c +++ b/arch/m68knommu/platform/68360/commproc.c | |||
| @@ -210,7 +210,7 @@ void | |||
| 210 | cpm_install_handler(int vec, void (*handler)(), void *dev_id) | 210 | cpm_install_handler(int vec, void (*handler)(), void *dev_id) |
| 211 | { | 211 | { |
| 212 | 212 | ||
| 213 | request_irq(vec, handler, IRQ_FLG_LOCK, "timer", dev_id); | 213 | request_irq(vec, handler, 0, "timer", dev_id); |
| 214 | 214 | ||
| 215 | /* if (cpm_vecs[vec].handler != 0) */ | 215 | /* if (cpm_vecs[vec].handler != 0) */ |
| 216 | /* printk(KERN_INFO "CPM interrupt %x replacing %x\n", */ | 216 | /* printk(KERN_INFO "CPM interrupt %x replacing %x\n", */ |