aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2011-06-27 17:43:34 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-06-27 17:43:34 -0400
commita73738e9f85fa6ba3f1f9a6ea95b5e5fa99579a2 (patch)
tree1abb0512c8291fea61e299eb2df35597047dee31 /drivers/staging
parentd4620396d7e9759dd3f37a8155827477cf2b5309 (diff)
Staging: comedi: fix build breakages on some platforms
Some platforms do not have virt_to_bus(), so properly depend on CONFIG_VIRT_TO_BUS for the Comedi drivers that need this function. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/comedi/Kconfig21
1 files changed, 21 insertions, 0 deletions
diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
index bccdc12e843a..20008a4376e8 100644
--- a/drivers/staging/comedi/Kconfig
+++ b/drivers/staging/comedi/Kconfig
@@ -161,6 +161,7 @@ config COMEDI_PCL730
161 161
162config COMEDI_PCL812 162config COMEDI_PCL812
163 tristate "Advantech PCL-812/813 and ADlink ACL-8112/8113/8113/8216" 163 tristate "Advantech PCL-812/813 and ADlink ACL-8112/8113/8113/8216"
164 depends on VIRT_TO_BUS
164 default N 165 default N
165 ---help--- 166 ---help---
166 Enable support for Advantech PCL-812/PG, PCL-813/B, ADLink 167 Enable support for Advantech PCL-812/PG, PCL-813/B, ADLink
@@ -172,6 +173,7 @@ config COMEDI_PCL812
172 173
173config COMEDI_PCL816 174config COMEDI_PCL816
174 tristate "Advantech PCL-814 and PCL-816 ISA card support" 175 tristate "Advantech PCL-814 and PCL-816 ISA card support"
176 depends on VIRT_TO_BUS
175 default N 177 default N
176 ---help--- 178 ---help---
177 Enable support for Advantech PCL-814 and PCL-816 ISA cards 179 Enable support for Advantech PCL-814 and PCL-816 ISA cards
@@ -181,6 +183,7 @@ config COMEDI_PCL816
181 183
182config COMEDI_PCL818 184config COMEDI_PCL818
183 tristate "Advantech PCL-718 and PCL-818 ISA card support" 185 tristate "Advantech PCL-718 and PCL-818 ISA card support"
186 depends on VIRT_TO_BUS
184 default N 187 default N
185 ---help--- 188 ---help---
186 Enable support for Advantech PCL-818 ISA cards 189 Enable support for Advantech PCL-818 ISA cards
@@ -270,6 +273,7 @@ config COMEDI_DAS800
270 273
271config COMEDI_DAS1800 274config COMEDI_DAS1800
272 tristate "DAS1800 and compatible ISA card support" 275 tristate "DAS1800 and compatible ISA card support"
276 depends on VIRT_TO_BUS
273 select COMEDI_FC 277 select COMEDI_FC
274 default N 278 default N
275 ---help--- 279 ---help---
@@ -341,6 +345,7 @@ config COMEDI_DT2817
341config COMEDI_DT282X 345config COMEDI_DT282X
342 tristate "Data Translation DT2821 series and DT-EZ ISA card support" 346 tristate "Data Translation DT2821 series and DT-EZ ISA card support"
343 select COMEDI_FC 347 select COMEDI_FC
348 depends on VIRT_TO_BUS
344 default N 349 default N
345 ---help--- 350 ---help---
346 Enable support for Data Translation DT2821 series including DT-EZ 351 Enable support for Data Translation DT2821 series including DT-EZ
@@ -420,6 +425,7 @@ config COMEDI_ADQ12B
420config COMEDI_NI_AT_A2150 425config COMEDI_NI_AT_A2150
421 tristate "NI AT-A2150 ISA card support" 426 tristate "NI AT-A2150 ISA card support"
422 depends on COMEDI_NI_COMMON 427 depends on COMEDI_NI_COMMON
428 depends on VIRT_TO_BUS
423 default N 429 default N
424 ---help--- 430 ---help---
425 Enable support for National Instruments AT-A2150 cards 431 Enable support for National Instruments AT-A2150 cards
@@ -537,6 +543,7 @@ if COMEDI_PCI_DRIVERS && PCI
537 543
538config COMEDI_ADDI_APCI_035 544config COMEDI_ADDI_APCI_035
539 tristate "ADDI-DATA APCI_035 support" 545 tristate "ADDI-DATA APCI_035 support"
546 depends on VIRT_TO_BUS
540 default N 547 default N
541 ---help--- 548 ---help---
542 Enable support for ADDI-DATA APCI_035 cards 549 Enable support for ADDI-DATA APCI_035 cards
@@ -546,6 +553,7 @@ config COMEDI_ADDI_APCI_035
546 553
547config COMEDI_ADDI_APCI_1032 554config COMEDI_ADDI_APCI_1032
548 tristate "ADDI-DATA APCI_1032 support" 555 tristate "ADDI-DATA APCI_1032 support"
556 depends on VIRT_TO_BUS
549 default N 557 default N
550 ---help--- 558 ---help---
551 Enable support for ADDI-DATA APCI_1032 cards 559 Enable support for ADDI-DATA APCI_1032 cards
@@ -555,6 +563,7 @@ config COMEDI_ADDI_APCI_1032
555 563
556config COMEDI_ADDI_APCI_1500 564config COMEDI_ADDI_APCI_1500
557 tristate "ADDI-DATA APCI_1500 support" 565 tristate "ADDI-DATA APCI_1500 support"
566 depends on VIRT_TO_BUS
558 default N 567 default N
559 ---help--- 568 ---help---
560 Enable support for ADDI-DATA APCI_1500 cards 569 Enable support for ADDI-DATA APCI_1500 cards
@@ -564,6 +573,7 @@ config COMEDI_ADDI_APCI_1500
564 573
565config COMEDI_ADDI_APCI_1516 574config COMEDI_ADDI_APCI_1516
566 tristate "ADDI-DATA APCI_1516 support" 575 tristate "ADDI-DATA APCI_1516 support"
576 depends on VIRT_TO_BUS
567 default N 577 default N
568 ---help--- 578 ---help---
569 Enable support for ADDI-DATA APCI_1516 cards 579 Enable support for ADDI-DATA APCI_1516 cards
@@ -573,6 +583,7 @@ config COMEDI_ADDI_APCI_1516
573 583
574config COMEDI_ADDI_APCI_1564 584config COMEDI_ADDI_APCI_1564
575 tristate "ADDI-DATA APCI_1564 support" 585 tristate "ADDI-DATA APCI_1564 support"
586 depends on VIRT_TO_BUS
576 default N 587 default N
577 ---help--- 588 ---help---
578 Enable support for ADDI-DATA APCI_1564 cards 589 Enable support for ADDI-DATA APCI_1564 cards
@@ -582,6 +593,7 @@ config COMEDI_ADDI_APCI_1564
582 593
583config COMEDI_ADDI_APCI_16XX 594config COMEDI_ADDI_APCI_16XX
584 tristate "ADDI-DATA APCI_16xx support" 595 tristate "ADDI-DATA APCI_16xx support"
596 depends on VIRT_TO_BUS
585 default N 597 default N
586 ---help--- 598 ---help---
587 Enable support for ADDI-DATA APCI_16xx cards 599 Enable support for ADDI-DATA APCI_16xx cards
@@ -591,6 +603,7 @@ config COMEDI_ADDI_APCI_16XX
591 603
592config COMEDI_ADDI_APCI_2016 604config COMEDI_ADDI_APCI_2016
593 tristate "ADDI-DATA APCI_2016 support" 605 tristate "ADDI-DATA APCI_2016 support"
606 depends on VIRT_TO_BUS
594 default N 607 default N
595 ---help--- 608 ---help---
596 Enable support for ADDI-DATA APCI_2016 cards 609 Enable support for ADDI-DATA APCI_2016 cards
@@ -600,6 +613,7 @@ config COMEDI_ADDI_APCI_2016
600 613
601config COMEDI_ADDI_APCI_2032 614config COMEDI_ADDI_APCI_2032
602 tristate "ADDI-DATA APCI_2032 support" 615 tristate "ADDI-DATA APCI_2032 support"
616 depends on VIRT_TO_BUS
603 default N 617 default N
604 ---help--- 618 ---help---
605 Enable support for ADDI-DATA APCI_2032 cards 619 Enable support for ADDI-DATA APCI_2032 cards
@@ -609,6 +623,7 @@ config COMEDI_ADDI_APCI_2032
609 623
610config COMEDI_ADDI_APCI_2200 624config COMEDI_ADDI_APCI_2200
611 tristate "ADDI-DATA APCI_2200 support" 625 tristate "ADDI-DATA APCI_2200 support"
626 depends on VIRT_TO_BUS
612 default N 627 default N
613 ---help--- 628 ---help---
614 Enable support for ADDI-DATA APCI_2200 cards 629 Enable support for ADDI-DATA APCI_2200 cards
@@ -618,6 +633,7 @@ config COMEDI_ADDI_APCI_2200
618 633
619config COMEDI_ADDI_APCI_3001 634config COMEDI_ADDI_APCI_3001
620 tristate "ADDI-DATA APCI_3001 support" 635 tristate "ADDI-DATA APCI_3001 support"
636 depends on VIRT_TO_BUS
621 select COMEDI_FC 637 select COMEDI_FC
622 default N 638 default N
623 ---help--- 639 ---help---
@@ -628,6 +644,7 @@ config COMEDI_ADDI_APCI_3001
628 644
629config COMEDI_ADDI_APCI_3120 645config COMEDI_ADDI_APCI_3120
630 tristate "ADDI-DATA APCI_3520 support" 646 tristate "ADDI-DATA APCI_3520 support"
647 depends on VIRT_TO_BUS
631 select COMEDI_FC 648 select COMEDI_FC
632 default N 649 default N
633 ---help--- 650 ---help---
@@ -638,6 +655,7 @@ config COMEDI_ADDI_APCI_3120
638 655
639config COMEDI_ADDI_APCI_3501 656config COMEDI_ADDI_APCI_3501
640 tristate "ADDI-DATA APCI_3501 support" 657 tristate "ADDI-DATA APCI_3501 support"
658 depends on VIRT_TO_BUS
641 default N 659 default N
642 ---help--- 660 ---help---
643 Enable support for ADDI-DATA APCI_3501 cards 661 Enable support for ADDI-DATA APCI_3501 cards
@@ -647,6 +665,7 @@ config COMEDI_ADDI_APCI_3501
647 665
648config COMEDI_ADDI_APCI_3XXX 666config COMEDI_ADDI_APCI_3XXX
649 tristate "ADDI-DATA APCI_3xxx support" 667 tristate "ADDI-DATA APCI_3xxx support"
668 depends on VIRT_TO_BUS
650 default N 669 default N
651 ---help--- 670 ---help---
652 Enable support for ADDI-DATA APCI_3xxx cards 671 Enable support for ADDI-DATA APCI_3xxx cards
@@ -713,6 +732,7 @@ config COMEDI_ADL_PCI9111
713config COMEDI_ADL_PCI9118 732config COMEDI_ADL_PCI9118
714 tristate "ADLink PCI-9118DG, PCI-9118HG, PCI-9118HR support" 733 tristate "ADLink PCI-9118DG, PCI-9118HG, PCI-9118HR support"
715 select COMEDI_FC 734 select COMEDI_FC
735 depends on VIRT_TO_BUS
716 default N 736 default N
717 ---help--- 737 ---help---
718 Enable support for ADlink PCI-9118DG, PCI-9118HG, PCI-9118HR cards 738 Enable support for ADlink PCI-9118DG, PCI-9118HG, PCI-9118HR cards
@@ -1288,6 +1308,7 @@ config COMEDI_NI_LABPC
1288 depends on COMEDI_MITE 1308 depends on COMEDI_MITE
1289 select COMEDI_8255 1309 select COMEDI_8255
1290 select COMEDI_FC 1310 select COMEDI_FC
1311 depends on VIRT_TO_BUS
1291 default N 1312 default N
1292 ---help--- 1313 ---help---
1293 Enable support for National Instruments Lab-PC and compatibles 1314 Enable support for National Instruments Lab-PC and compatibles