Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f315ccb3 authored by Steve French's avatar Steve French
Browse files

Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

parents ead03e30 551e4fb2
Loading
Loading
Loading
Loading
+16 −5
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@
   <title>Introduction</title>
  <para>
    This document describes the interfaces available for device drivers that
    drive s390 based channel attached devices. This includes interfaces for
    drive s390 based channel attached I/O devices. This includes interfaces for
    interaction with the hardware and interfaces for interacting with the
    common driver core. Those interfaces are provided by the s390 common I/O
    layer.
@@ -86,9 +86,10 @@
	The ccw bus typically contains the majority of devices available to
	a s390 system. Named after the channel command word (ccw), the basic
	command structure used to address its devices, the ccw bus contains
	so-called channel attached devices. They are addressed via subchannels,
	visible on the css bus. A device driver, however, will never interact
	with the subchannel directly, but only via the device on the ccw bus,
	so-called channel attached devices. They are addressed via I/O
	subchannels, visible on the css bus. A device driver for
	channel-attached devices, however, will never interact	with the
	subchannel directly, but only via the I/O device on the ccw bus,
	the ccw device.
  </para>
    <sect1 id="channelIO">
@@ -116,7 +117,6 @@
!Iinclude/asm-s390/ccwdev.h
!Edrivers/s390/cio/device.c
!Edrivers/s390/cio/device_ops.c
!Edrivers/s390/cio/airq.c
    </sect1>
    <sect1 id="cmf">
     <title>The channel-measurement facility</title>
@@ -147,4 +147,15 @@
   </sect1>
  </chapter>

  <chapter id="genericinterfaces">
   <title>Generic interfaces</title>
  <para>
	Some interfaces are available to other drivers that do not necessarily
	have anything to do with the busses described above, but still are
	indirectly using basic infrastructure in the common I/O layer.
	One example is the support for adapter interrupts.
  </para>
!Edrivers/s390/cio/airq.c
  </chapter>

</book>
+493 −0

File added.

Preview size limit exceeded, changes collapsed.

+78 −17

File changed.

Preview size limit exceeded, changes collapsed.

+121 −12

File changed.

Preview size limit exceeded, changes collapsed.

+3 −0
Original line number Diff line number Diff line
Kernel driver pca9539
=====================

NOTE: this driver is deprecated and will be dropped soon, use
drivers/gpio/pca9539.c instead.

Supported chips:
  * Philips PCA9539
    Prefix: 'pca9539'
Loading