projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '83xx' into for_paulus
[powerpc.git]
/
drivers
/
net
/
hamradio
/
scc.c
diff --git
a/drivers/net/hamradio/scc.c
b/drivers/net/hamradio/scc.c
index
5927784
..
df4b681
100644
(file)
--- a/
drivers/net/hamradio/scc.c
+++ b/
drivers/net/hamradio/scc.c
@@
-148,7
+148,6
@@
/* ----------------------------------------------------------------------- */
/* ----------------------------------------------------------------------- */
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/signal.h>
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/signal.h>
@@
-1737,7
+1736,7
@@
static int scc_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
if (!Ivec[hwcfg.irq].used && hwcfg.irq)
{
if (!Ivec[hwcfg.irq].used && hwcfg.irq)
{
- if (request_irq(hwcfg.irq, scc_isr,
SA_INTERRUPT
, "AX.25 SCC", NULL))
+ if (request_irq(hwcfg.irq, scc_isr,
IRQF_DISABLED
, "AX.25 SCC", NULL))
printk(KERN_WARNING "z8530drv: warning, cannot get IRQ %d\n", hwcfg.irq);
else
Ivec[hwcfg.irq].used = 1;
printk(KERN_WARNING "z8530drv: warning, cannot get IRQ %d\n", hwcfg.irq);
else
Ivec[hwcfg.irq].used = 1;