Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 336971
b: refs/heads/master
c: 6e8bd6e
h: refs/heads/master
i:
  336969: 468c171
  336967: fd0ee5b
v: v3
  • Loading branch information
Kees Cook authored and Greg Kroah-Hartman committed Nov 16, 2012
1 parent 3bfe2a0 commit 6da5559
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 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: 9aa8b50b2b3d3a70728438a15a0fdd03a6794a84
refs/heads/master: 6e8bd6e727c5ec949194087ac6b593e1e7fe79c4
16 changes: 8 additions & 8 deletions trunk/drivers/parport/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ config PARPORT_SERIAL
will be called parport_serial.

config PARPORT_PC_FIFO
bool "Use FIFO/DMA if available (EXPERIMENTAL)"
depends on PARPORT_PC && EXPERIMENTAL
bool "Use FIFO/DMA if available"
depends on PARPORT_PC
help
Many parallel port chipsets provide hardware that can speed up
printing. Say Y here if you want to take advantage of that.
Expand All @@ -70,8 +70,8 @@ config PARPORT_PC_FIFO
specify which IRQ/DMA to use.

config PARPORT_PC_SUPERIO
bool "SuperIO chipset support (EXPERIMENTAL)"
depends on PARPORT_PC && EXPERIMENTAL
bool "SuperIO chipset support"
depends on PARPORT_PC
help
Saying Y here enables some probes for Super-IO chipsets in order to
find out things like base addresses, IRQ lines and DMA channels. It
Expand All @@ -85,8 +85,8 @@ config PARPORT_PC_PCMCIA
ports. If unsure, say N.

config PARPORT_IP32
tristate "SGI IP32 builtin port (EXPERIMENTAL)"
depends on SGI_IP32 && EXPERIMENTAL
tristate "SGI IP32 builtin port"
depends on SGI_IP32
select PARPORT_NOT_PC
help
Say Y here if you need support for the parallel port on
Expand Down Expand Up @@ -126,8 +126,8 @@ config PARPORT_GSC
select PARPORT_NOT_PC

config PARPORT_SUNBPP
tristate "Sparc hardware (EXPERIMENTAL)"
depends on SBUS && EXPERIMENTAL
tristate "Sparc hardware"
depends on SBUS
select PARPORT_NOT_PC
help
This driver provides support for the bidirectional parallel port
Expand Down

0 comments on commit 6da5559

Please sign in to comment.