Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 173840
b: refs/heads/master
c: ad4e22f
h: refs/heads/master
v: v3
  • Loading branch information
Uwe Kleine-König authored and Ben Dooks committed Dec 8, 2009
1 parent 45a27ba commit 49a3189
Show file tree
Hide file tree
Showing 4,634 changed files with 131,358 additions and 285,931 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e49aedb594dc9cd4add2f0fd7360952c11017532
refs/heads/master: ad4e22fa4762516eef0e3f19a13a86e13fba71e8
1 change: 0 additions & 1 deletion trunk/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
*.elf
*.bin
*.gz
*.bz2
*.lzma
*.patch
*.gcno
Expand Down
8 changes: 0 additions & 8 deletions trunk/Documentation/ABI/stable/sysfs-driver-qla2xxx

This file was deleted.

2 changes: 1 addition & 1 deletion trunk/Documentation/ABI/testing/procfs-diskstats
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Description:
1 - major number
2 - minor mumber
3 - device name
4 - reads completed successfully
4 - reads completed succesfully
5 - reads merged
6 - sectors read
7 - time spent reading (ms)
Expand Down
2 changes: 1 addition & 1 deletion trunk/Documentation/ABI/testing/sysfs-block
Original file line number Diff line number Diff line change
Expand Up @@ -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 successfully
1 - reads completed succesfully
2 - reads merged
3 - sectors read
4 - time spent reading (ms)
Expand Down
6 changes: 3 additions & 3 deletions trunk/Documentation/DMA-mapping.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 DMA_BIT_MASK(24)
#define RECORD_ADDRESS_BITS 0x00ffffff

struct my_sound_card *card;
struct pci_dev *pdev;
Expand All @@ -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_WARNING "%s: Playback disabled due to DMA limitations.\n",
printk(KERN_WARN "%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_WARNING "%s: Record disabled due to DMA limitations.\n",
printk(KERN_WARN "%s: Record disabled due to DMA limitations.\n",
card->name);
}

Expand Down
4 changes: 2 additions & 2 deletions trunk/Documentation/DocBook/genericirq.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -417,8 +417,8 @@ desc->chip->end();
</para>
<para>
To make use of the split implementation, replace the call to
__do_IRQ by a call to desc->handle_irq() and associate
the appropriate handler function to desc->handle_irq().
__do_IRQ by a call to desc->chip->handle_irq() and associate
the appropriate handler function to desc->chip->handle_irq().
In most cases the generic handler implementations should
be sufficient.
</para>
Expand Down
2 changes: 1 addition & 1 deletion trunk/Documentation/DocBook/kernel-hacking.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ asmlinkage long sys_mycall(int arg)
</para>

<programlisting>
if (signal_pending(current))
if (signal_pending())
return -ERESTARTSYS;
</programlisting>

Expand Down
2 changes: 1 addition & 1 deletion trunk/Documentation/DocBook/mtdnand.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ module_exit(board_cleanup);
<sect1 id="Multiple_chip_control">
<title>Multiple chip control</title>
<para>
The nand driver can control chip arrays. Therefore the
The nand driver can control chip arrays. Therefor the
board driver must provide an own select_chip function. This
function must (de)select the requested chip.
The function pointer in the nand_chip structure must
Expand Down
5 changes: 0 additions & 5 deletions trunk/Documentation/DocBook/tracepoint.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,4 @@
!Iinclude/trace/events/irq.h
</chapter>

<chapter id="signal">
<title>SIGNAL</title>
!Iinclude/trace/events/signal.h
</chapter>

</book>
2 changes: 1 addition & 1 deletion trunk/Documentation/DocBook/v4l/videodev2.h.xml
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ struct <link linkend="v4l2-jpegcompression">v4l2_jpegcompression</link> {
* you do, leave them untouched.
* Inluding less markers will make the
* resulting code smaller, but there will
* be fewer applications which can read it.
* be fewer aplications which can read it.
* The presence of the APP and COM marker
* is influenced by APP_len and COM_len
* ONLY, not by this property! */
Expand Down
2 changes: 1 addition & 1 deletion trunk/Documentation/DocBook/writing-an-alsa-driver.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -5318,7 +5318,7 @@ struct _snd_pcm_runtime {
pages of the given size and map them onto the virtually contiguous
memory. The virtual pointer is addressed in runtime-&gt;dma_area.
The physical address (runtime-&gt;dma_addr) is set to zero,
because the buffer is physically non-contiguous.
because the buffer is physically non-contigous.
The physical address table is set up in sgbuf-&gt;table.
You can get the physical address at a certain offset via
<function>snd_pcm_sgbuf_get_addr()</function>.
Expand Down
Loading

0 comments on commit 49a3189

Please sign in to comment.