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
/
teles3.c
diff --git
a/drivers/isdn/hisax/teles3.c
b/drivers/isdn/hisax/teles3.c
index
c5b1f65
..
6a5e379
100644
(file)
--- a/
drivers/isdn/hisax/teles3.c
+++ b/
drivers/isdn/hisax/teles3.c
@@
-21,7
+21,7
@@
#include "isdnl1.h"
extern const char *CardType[];
#include "isdnl1.h"
extern const char *CardType[];
-const char *teles3_revision = "$Revision: 2.19.2.4 $";
+
static
const char *teles3_revision = "$Revision: 2.19.2.4 $";
#define byteout(addr,val) outb(val,addr)
#define bytein(addr) inb(addr)
#define byteout(addr,val) outb(val,addr)
#define bytein(addr) inb(addr)
@@
-101,7
+101,7
@@
WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value)
#include "hscx_irq.c"
static irqreturn_t
#include "hscx_irq.c"
static irqreturn_t
-teles3_interrupt(int intno, void *dev_id
, struct pt_regs *regs
)
+teles3_interrupt(int intno, void *dev_id)
{
#define MAXCOUNT 5
struct IsdnCardState *cs = dev_id;
{
#define MAXCOUNT 5
struct IsdnCardState *cs = dev_id;
@@
-143,7
+143,7
@@
teles3_interrupt(int intno, void *dev_id, struct pt_regs *regs)
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
-
inline static
void
+
static inline
void
release_ioregs(struct IsdnCardState *cs, int mask)
{
if (mask & 1)
release_ioregs(struct IsdnCardState *cs, int mask)
{
if (mask & 1)
@@
-154,7
+154,7
@@
release_ioregs(struct IsdnCardState *cs, int mask)
release_region(cs->hw.teles3.hscx[1] + 32, 32);
}
release_region(cs->hw.teles3.hscx[1] + 32, 32);
}
-void
+
static
void
release_io_teles3(struct IsdnCardState *cs)
{
if (cs->typ == ISDN_CTYPE_TELESPCMCIA) {
release_io_teles3(struct IsdnCardState *cs)
{
if (cs->typ == ISDN_CTYPE_TELESPCMCIA) {
@@
-369,6
+369,7
@@
setup_teles3(struct IsdnCard *card)
cs->hw.teles3.hscx[1] + 96);
return (0);
}
cs->hw.teles3.hscx[1] + 96);
return (0);
}
+ cs->irq_flags |= IRQF_SHARED; /* cardbus can share */
} else {
if (cs->hw.teles3.cfg_reg) {
if (cs->typ == ISDN_CTYPE_COMPAQ_ISA) {
} else {
if (cs->hw.teles3.cfg_reg) {
if (cs->typ == ISDN_CTYPE_COMPAQ_ISA) {