git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
isdn
/
hisax
/
avm_pci.c
diff --git
a/drivers/isdn/hisax/avm_pci.c
b/drivers/isdn/hisax/avm_pci.c
index
4abe5ff
..
b04a178
100644
(file)
--- a/
drivers/isdn/hisax/avm_pci.c
+++ b/
drivers/isdn/hisax/avm_pci.c
@@
-12,7
+12,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/init.h>
#include "hisax.h"
#include "isac.h"
#include <linux/init.h>
#include "hisax.h"
#include "isac.h"
@@
-640,7
+639,7
@@
clear_pending_hdlc_ints(struct IsdnCardState *cs)
}
#endif /* 0 */
}
#endif /* 0 */
-static void
__init
+static void
inithdlc(struct IsdnCardState *cs)
{
cs->bcs[0].BC_SetStack = setstack_hdlc;
inithdlc(struct IsdnCardState *cs)
{
cs->bcs[0].BC_SetStack = setstack_hdlc;
@@
-652,7
+651,7
@@
inithdlc(struct IsdnCardState *cs)
}
static irqreturn_t
}
static irqreturn_t
-avm_pcipnp_interrupt(int intno, void *dev_id
, struct pt_regs *regs
)
+avm_pcipnp_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_long flags;
{
struct IsdnCardState *cs = dev_id;
u_long flags;
@@
-728,13
+727,13
@@
AVM_card_msg(struct IsdnCardState *cs, int mt, void *arg)
}
#ifdef CONFIG_PCI
}
#ifdef CONFIG_PCI
-static struct pci_dev *dev_avm __initdata = NULL;
+static struct pci_dev *dev_avm __
dev
initdata = NULL;
#endif
#ifdef __ISAPNP__
#endif
#ifdef __ISAPNP__
-static struct pnp_card *pnp_avm_c __initdata = NULL;
+static struct pnp_card *pnp_avm_c __
dev
initdata = NULL;
#endif
#endif
-int __init
+int __
dev
init
setup_avm_pcipnp(struct IsdnCard *card)
{
u_int val, ver;
setup_avm_pcipnp(struct IsdnCard *card)
{
u_int val, ver;
@@
-809,7
+808,7
@@
setup_avm_pcipnp(struct IsdnCard *card)
printk(KERN_WARNING "FritzPCI: No PCI card found\n");
return(0);
}
printk(KERN_WARNING "FritzPCI: No PCI card found\n");
return(0);
}
- cs->irq_flags |=
SA_SHIRQ
;
+ cs->irq_flags |=
IRQF_SHARED
;
#else
printk(KERN_WARNING "FritzPCI: NO_PCI_BIOS\n");
return (0);
#else
printk(KERN_WARNING "FritzPCI: NO_PCI_BIOS\n");
return (0);