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

Commit 86d68898 authored by James Morris's avatar James Morris
Browse files

Merge branch 'master' into next

parents 93c06cbb 4c246edd

Documentation/00-INDEX

+0 −2
Original line number Diff line number Diff line
@@ -89,8 +89,6 @@ cciss.txt 
	- info, major/minor #'s for Compaq's SMART Array Controllers.

cdrom/

	- directory with information on the CD-ROM drivers that Linux has.

cli-sti-removal.txt

	- cli()/sti() removal guide.

computone.txt

	- info on Computone Intelliport II/Plus Multiport Serial Driver.

connector/

Documentation/DocBook/Makefile

+8 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \ 
	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \

	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \

	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \

	    mac80211.xml debugobjects.xml

	    mac80211.xml debugobjects.xml sh.xml



###

# The build process is as follows (targets):
@@ -102,6 +102,13 @@ C-procfs-example = procfs_example.xml 
C-procfs-example2 = $(addprefix $(obj)/,$(C-procfs-example))

$(obj)/procfs-guide.xml: $(C-procfs-example2)



# List of programs to build

##oops, this is a kernel module::hostprogs-y := procfs_example

obj-m += procfs_example.o



# Tell kbuild to always build the programs

always := $(hostprogs-y)



notfoundtemplate = echo "*** You have to install docbook-utils or xmlto ***"; \

		   exit 1

db2xtemplate = db2TYPE -o $(dir $@) $<

Documentation/DocBook/procfs_example.c

+1 −3
Original line number Diff line number Diff line
@@ -189,8 +189,6 @@ static int __init init_procfs_example(void) 
	return 0;



no_symlink:

	remove_proc_entry("tty", example_dir);

no_tty:

	remove_proc_entry("bar", example_dir);

no_bar:

	remove_proc_entry("foo", example_dir);
@@ -206,7 +204,6 @@ static int __init init_procfs_example(void) 
static void __exit cleanup_procfs_example(void)

{

	remove_proc_entry("jiffies_too", example_dir);

	remove_proc_entry("tty", example_dir);

	remove_proc_entry("bar", example_dir);

	remove_proc_entry("foo", example_dir);

	remove_proc_entry("jiffies", example_dir);
@@ -222,3 +219,4 @@ module_exit(cleanup_procfs_example); 


MODULE_AUTHOR("Erik Mouw");

MODULE_DESCRIPTION("procfs examples");

MODULE_LICENSE("GPL");

Documentation/DocBook/s390-drivers.tmpl

+4 −4
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ 
      the hardware structures represented here, please consult the Principles

      of Operation.

    </para>

!Iinclude/asm-s390/cio.h

!Iarch/s390/include/asm/cio.h

    </sect1>

    <sect1 id="ccwdev">

     <title>ccw devices</title>
@@ -114,7 +114,7 @@ 
      ccw device structure. Device drivers must not bypass those functions

      or strange side effects may happen.

    </para>

!Iinclude/asm-s390/ccwdev.h

!Iarch/s390/include/asm/ccwdev.h

!Edrivers/s390/cio/device.c

!Edrivers/s390/cio/device_ops.c

    </sect1>
@@ -125,7 +125,7 @@ 
	measurement data which is made available by the channel subsystem

	for each channel attached device.

  </para>

!Iinclude/asm-s390/cmb.h

!Iarch/s390/include/asm/cmb.h

!Edrivers/s390/cio/cmf.c

    </sect1>

  </chapter>
@@ -142,7 +142,7 @@ 
  </para>

   <sect1 id="ccwgroupdevices">

    <title>ccw group devices</title>

!Iinclude/asm-s390/ccwgroup.h

!Iarch/s390/include/asm/ccwgroup.h

!Edrivers/s390/cio/ccwgroup.c

   </sect1>

  </chapter>

Documentation/DocBook/sh.tmpl

0 → 100644
+105 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"

	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []>



<book id="sh-drivers">

 <bookinfo>

  <title>SuperH Interfaces Guide</title>

  

  <authorgroup>

   <author>

    <firstname>Paul</firstname>

    <surname>Mundt</surname>

    <affiliation>

     <address>

      <email>lethal@linux-sh.org</email>

     </address>

    </affiliation>

   </author>

  </authorgroup>



  <copyright>

   <year>2008</year>

   <holder>Paul Mundt</holder>

  </copyright>

  <copyright>

   <year>2008</year>

   <holder>Renesas Technology Corp.</holder>

  </copyright>



  <legalnotice>

   <para>

     This documentation is free software; you can redistribute

     it and/or modify it under the terms of the GNU General Public

     License version 2 as published by the Free Software Foundation.

   </para>

      

   <para>

     This program is distributed in the hope that it will be

     useful, but WITHOUT ANY WARRANTY; without even the implied

     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

     See the GNU General Public License for more details.

   </para>

      

   <para>

     You should have received a copy of the GNU General Public

     License along with this program; if not, write to the Free

     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,

     MA 02111-1307 USA

   </para>

      

   <para>

     For more details see the file COPYING in the source

     distribution of Linux.

   </para>

  </legalnotice>

 </bookinfo>



<toc></toc>



  <chapter id="mm">

    <title>Memory Management</title>

    <sect1 id="sh4">

    <title>SH-4</title>

      <sect2 id="sq">

        <title>Store Queue API</title>

!Earch/sh/kernel/cpu/sh4/sq.c

      </sect2>

    </sect1>

    <sect1 id="sh5">

      <title>SH-5</title>

      <sect2 id="tlb">

	<title>TLB Interfaces</title>

!Iarch/sh/mm/tlb-sh5.c

!Iarch/sh/include/asm/tlb_64.h

      </sect2>

    </sect1>

  </chapter>

  <chapter id="clk">

    <title>Clock Framework Extensions</title>

!Iarch/sh/include/asm/clock.h

  </chapter>

  <chapter id="mach">

    <title>Machine Specific Interfaces</title>

    <sect1 id="dreamcast">

      <title>mach-dreamcast</title>

!Iarch/sh/boards/mach-dreamcast/rtc.c

    </sect1>

    <sect1 id="x3proto">

      <title>mach-x3proto</title>

!Earch/sh/boards/mach-x3proto/ilsel.c

    </sect1>

  </chapter>

  <chapter id="busses">

    <title>Busses</title>

    <sect1 id="superhyway">

      <title>SuperHyway</title>

!Edrivers/sh/superhyway/superhyway.c

    </sect1>



    <sect1 id="maple">

      <title>Maple</title>

!Edrivers/sh/maple/maple.c

    </sect1>

  </chapter>

</book>