Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/uio-2.6 (fc15bc81) · Commits · 戴 / test

Documentation/DocBook/kernel-api.tmpl

+4 −0

Original line number	Diff line number	Diff line
		@@ -408,6 +408,10 @@ X!Edrivers/pnp/system.c
		!Edrivers/pnp/manager.c
		!Edrivers/pnp/support.c
		</sect1>
		<sect1><title>Userspace IO devices</title>
		!Edrivers/uio/uio.c
		!Iinclude/linux/uio_driver.h
		</sect1>
		</chapter>

		<chapter id="blkdev">

0 → 100644

+611 −0

File added.

Preview size limit exceeded, changes collapsed.

+1 −0

Original line number	Diff line number	Diff line
		@@ -84,4 +84,5 @@ source "drivers/auxdisplay/Kconfig"

		source "drivers/kvm/Kconfig"

		source "drivers/uio/Kconfig"
		endmenu

+1 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ obj-$(CONFIG_ATA) += ata/
		obj-$(CONFIG_FUSION) += message/
		obj-$(CONFIG_FIREWIRE) += firewire/
		obj-$(CONFIG_IEEE1394) += ieee1394/
		obj-$(CONFIG_UIO) += uio/
		obj-y += cdrom/
		obj-y += auxdisplay/
		obj-$(CONFIG_MTD) += mtd/

0 → 100644

+29 −0

Original line number	Diff line number	Diff line
		menu "Userspace I/O"
		depends on !S390

		config UIO
		tristate "Userspace I/O drivers"
		default n
		help
		Enable this to allow the userspace driver core code to be
		built. This code allows userspace programs easy access to
		kernel interrupts and memory locations, allowing some drivers
		to be written in userspace. Note that a small kernel driver
		is also required for interrupt handling to work properly.

		If you don't know what to do here, say N.

		config UIO_CIF
		tristate "generic Hilscher CIF Card driver"
		depends on UIO && PCI
		default n
		help
		Driver for Hilscher CIF DeviceNet and Profibus cards. This
		driver requires a userspace component that handles all of the
		heavy lifting and can be found at:
		http://www.osadl.org/projects/downloads/UIO/user/cif-*

		To compile this driver as a module, choose M here: the module
		will be called uio_cif.

		endmenu