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

Commit e3f4e1cb authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

parents adfe67dd d71cb81a

Documentation/ABI/stable/sysfs-driver-qla2xxx

0 → 100644
+8 −0
Original line number Original line Diff line number Diff line 
What:		/sys/bus/pci/drivers/qla2xxx/.../devices/*

Date:		September 2009

Contact:	QLogic Linux Driver <linux-driver@qlogic.com>

Description:	qla2xxx-udev.sh currently looks for uevent CHANGE events to

		signal a firmware-dump has been generated by the driver and is

		ready for retrieval.

Users:		qla2xxx-udev.sh.  Proposed changes should be mailed to

		linux-driver@qlogic.com

Documentation/ABI/testing/procfs-diskstats

+1 −1
Original line number Original line Diff line number Diff line
@@ -8,7 +8,7 @@ Description: 
		 1 - major number

		 1 - major number

		 2 - minor mumber

		 2 - minor mumber

		 3 - device name

		 3 - device name

		 4 - reads completed succesfully

		 4 - reads completed successfully

		 5 - reads merged

		 5 - reads merged

		 6 - sectors read

		 6 - sectors read

		 7 - time spent reading (ms)

		 7 - time spent reading (ms)

Documentation/ABI/testing/sysfs-block

+1 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ Contact: Jerome Marchand <jmarchan@redhat.com> 
Description:

Description:

		The /sys/block/<disk>/stat files displays the I/O

		The /sys/block/<disk>/stat files displays the I/O

		statistics of disk <disk>. They contain 11 fields:

		statistics of disk <disk>. They contain 11 fields:

		 1 - reads completed succesfully

		 1 - reads completed successfully

		 2 - reads merged

		 2 - reads merged

		 3 - sectors read

		 3 - sectors read

		 4 - time spent reading (ms)

		 4 - time spent reading (ms)

Documentation/DMA-mapping.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -214,7 +214,7 @@ most specific mask. 
Here is pseudo-code showing how this might be done:

Here is pseudo-code showing how this might be done:





	#define PLAYBACK_ADDRESS_BITS	DMA_BIT_MASK(32)

	#define PLAYBACK_ADDRESS_BITS	DMA_BIT_MASK(32)

	#define RECORD_ADDRESS_BITS	0x00ffffff

	#define RECORD_ADDRESS_BITS	DMA_BIT_MASK(24)





	struct my_sound_card *card;

	struct my_sound_card *card;

	struct pci_dev *pdev;

	struct pci_dev *pdev;
@@ -224,14 +224,14 @@ Here is pseudo-code showing how this might be done: 
		card->playback_enabled = 1;

		card->playback_enabled = 1;

	} else {

	} else {

		card->playback_enabled = 0;

		card->playback_enabled = 0;

		printk(KERN_WARN "%s: Playback disabled due to DMA limitations.\n",

		printk(KERN_WARNING "%s: Playback disabled due to DMA limitations.\n",

		       card->name);

		       card->name);

	}

	}

	if (!pci_set_dma_mask(pdev, RECORD_ADDRESS_BITS)) {

	if (!pci_set_dma_mask(pdev, RECORD_ADDRESS_BITS)) {

		card->record_enabled = 1;

		card->record_enabled = 1;

	} else {

	} else {

		card->record_enabled = 0;

		card->record_enabled = 0;

		printk(KERN_WARN "%s: Record disabled due to DMA limitations.\n",

		printk(KERN_WARNING "%s: Record disabled due to DMA limitations.\n",

		       card->name);

		       card->name);

	}

	}

Documentation/DocBook/device-drivers.tmpl

+13 −0
Original line number Original line Diff line number Diff line
@@ -293,10 +293,23 @@ X!Idrivers/video/console/fonts.c 




  <chapter id="input_subsystem">

  <chapter id="input_subsystem">

     <title>Input Subsystem</title>

     <title>Input Subsystem</title>

     <sect1><title>Input core</title>

!Iinclude/linux/input.h

!Iinclude/linux/input.h

!Edrivers/input/input.c

!Edrivers/input/input.c

!Edrivers/input/ff-core.c

!Edrivers/input/ff-core.c

!Edrivers/input/ff-memless.c

!Edrivers/input/ff-memless.c

     </sect1>

     <sect1><title>Polled input devices</title>

!Iinclude/linux/input-polldev.h

!Edrivers/input/input-polldev.c

     </sect1>

     <sect1><title>Matrix keyboars/keypads</title>

!Iinclude/linux/input/matrix_keypad.h

     </sect1>

     <sect1><title>Sparse keymap support</title>

!Iinclude/linux/input/sparse-keymap.h

!Edrivers/input/sparse-keymap.c

     </sect1>

  </chapter>

  </chapter>





  <chapter id="spi">

  <chapter id="spi">