Merge branch 'next/isa' into topic/misc (b8937162) · Commits · e / devices / android_kernel_xiaomi_markw

.gitignore

+1 −0

0 → 100644

+8 −0

Original line number	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

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ Description:
		1 - major number
		2 - minor mumber
		3 - device name
		4 - reads completed succesfully
		4 - reads completed successfully
		5 - reads merged
		6 - sectors read
		7 - time spent reading (ms)

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@ Contact: Jerome Marchand <jmarchan@redhat.com>
		Description:
		The /sys/block/<disk>/stat files displays the I/O
		statistics of disk <disk>. They contain 11 fields:
		1 - reads completed succesfully
		1 - reads completed successfully
		2 - reads merged
		3 - sectors read
		4 - time spent reading (ms)

+3 −3

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

		#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 pci_dev *pdev;
		@@ -224,14 +224,14 @@ Here is pseudo-code showing how this might be done:
		card->playback_enabled = 1;
		} else {
		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);
		}
		if (!pci_set_dma_mask(pdev, RECORD_ADDRESS_BITS)) {
		card->record_enabled = 1;
		} else {
		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);
		}