Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 197447
b: refs/heads/master
c: ba2450b
h: refs/heads/master
i:
  197445: 921a863
  197443: 79f67b1
  197439: ce75c91
v: v3
  • Loading branch information
Alexander Kurz authored and Greg Kroah-Hartman committed May 18, 2010
1 parent 37a78e6 commit b91cf61
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 77f047e25716cdefae7273d4e55f2cf74144c553
refs/heads/master: ba2450b89bd9dce7d8926d919a67ed515be3e05f
5 changes: 2 additions & 3 deletions trunk/drivers/staging/comedi/Kconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
config COMEDI
tristate "Data acquisition support (comedi)"
default N
depends on m && (PCI || PCMCIA || PCCARD || USB)
depends on m
---help---
Enable support a wide range of data acquisition devices
for Linux.
Expand Down Expand Up @@ -57,7 +57,6 @@ config COMEDI_TEST

config COMEDI_PARPORT
tristate "Parallel port support"
depends on PARPORT_PC
default N
---help---
Enable support for the standard parallel port.
Expand Down Expand Up @@ -1266,7 +1265,7 @@ config COMEDI_MITE

config COMEDI_NI_TIO
tristate "NI general purpose counter support"
depends on COMEDI_MITE
select COMEDI_MITE
default N
---help---
Enable support for National Instruments general purpose counters.
Expand Down

0 comments on commit b91cf61

Please sign in to comment.