Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
bfc7c89f
Commit
bfc7c89f
authored
Aug 02, 2007
by
Jeff Garzik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ISDN] Remove CONFIG_PCI ifdefs from 100% PCI source code
Signed-off-by:
Jeff Garzik
<
jeff@garzik.org
>
parent
782e3b3b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
20 deletions
+3
-20
drivers/isdn/hisax/bkm_a8.c
drivers/isdn/hisax/bkm_a8.c
+0
-8
drivers/isdn/hisax/telespci.c
drivers/isdn/hisax/telespci.c
+2
-6
drivers/isdn/hisax/w6692.c
drivers/isdn/hisax/w6692.c
+1
-6
No files found.
drivers/isdn/hisax/bkm_a8.c
View file @
bfc7c89f
...
...
@@ -20,8 +20,6 @@
#include <linux/pci.h>
#include "bkm_ax.h"
#ifdef CONFIG_PCI
#define ATTEMPT_PCI_REMAPPING
/* Required for PLX rev 1 */
extern
const
char
*
CardType
[];
...
...
@@ -279,12 +277,9 @@ static u_char pci_bus __devinitdata = 0;
static
u_char
pci_device_fn
__devinitdata
=
0
;
static
u_char
pci_irq
__devinitdata
=
0
;
#endif
/* CONFIG_PCI */
int
__devinit
setup_sct_quadro
(
struct
IsdnCard
*
card
)
{
#ifdef CONFIG_PCI
struct
IsdnCardState
*
cs
=
card
->
cs
;
char
tmp
[
64
];
u_int
found
=
0
;
...
...
@@ -442,7 +437,4 @@ setup_sct_quadro(struct IsdnCard *card)
sct_quadro_subtypes
[
cs
->
subtyp
],
readreg
(
cs
->
hw
.
ax
.
base
,
cs
->
hw
.
ax
.
data_adr
,
IPAC_ID
));
return
(
1
);
#else
printk
(
KERN_ERR
"HiSax: bkm_a8 only supported on PCI Systems
\n
"
);
#endif
/* CONFIG_PCI */
}
drivers/isdn/hisax/telespci.c
View file @
bfc7c89f
...
...
@@ -295,11 +295,12 @@ setup_telespci(struct IsdnCard *card)
#ifdef __BIG_ENDIAN
#error "not running on big endian machines now"
#endif
strcpy
(
tmp
,
telespci_revision
);
printk
(
KERN_INFO
"HiSax: Teles/PCI driver Rev. %s
\n
"
,
HiSax_getrev
(
tmp
));
if
(
cs
->
typ
!=
ISDN_CTYPE_TELESPCI
)
return
(
0
);
#ifdef CONFIG_PCI
if
((
dev_tel
=
pci_find_device
(
PCI_VENDOR_ID_ZORAN
,
PCI_DEVICE_ID_ZORAN_36120
,
dev_tel
)))
{
if
(
pci_enable_device
(
dev_tel
))
return
(
0
);
...
...
@@ -317,11 +318,6 @@ setup_telespci(struct IsdnCard *card)
printk
(
KERN_WARNING
"TelesPCI: No PCI card found
\n
"
);
return
(
0
);
}
#else
printk
(
KERN_WARNING
"HiSax: Teles/PCI and NO_PCI_BIOS
\n
"
);
printk
(
KERN_WARNING
"HiSax: Teles/PCI unable to config
\n
"
);
return
(
0
);
#endif
/* CONFIG_PCI */
/* Initialize Zoran PCI controller */
writel
(
0x00000000
,
cs
->
hw
.
teles0
.
membase
+
0x28
);
...
...
drivers/isdn/hisax/w6692.c
View file @
bfc7c89f
...
...
@@ -1009,7 +1009,7 @@ setup_w6692(struct IsdnCard *card)
printk
(
KERN_INFO
"HiSax: W6692 driver Rev. %s
\n
"
,
HiSax_getrev
(
tmp
));
if
(
cs
->
typ
!=
ISDN_CTYPE_W6692
)
return
(
0
);
#ifdef CONFIG_PCI
while
(
id_list
[
id_idx
].
vendor_id
)
{
dev_w6692
=
pci_find_device
(
id_list
[
id_idx
].
vendor_id
,
id_list
[
id_idx
].
device_id
,
...
...
@@ -1061,11 +1061,6 @@ setup_w6692(struct IsdnCard *card)
cs
->
hw
.
w6692
.
iobase
+
255
);
return
(
0
);
}
#else
printk
(
KERN_WARNING
"HiSax: W6692 and NO_PCI_BIOS
\n
"
);
printk
(
KERN_WARNING
"HiSax: W6692 unable to config
\n
"
);
return
(
0
);
#endif
/* CONFIG_PCI */
printk
(
KERN_INFO
"HiSax: %s config irq:%d I/O:%x
\n
"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment