diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 00:28:25 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 00:28:25 (GMT) |
| commit | 0dd7f883a9e21c5f2ff5e8f1cbb0e78cdc044d8a (patch) | |
| tree | 080ba867394e0346b699ffe17973a76faa0e6920 | |
| parent | cc896f08717c445235554a7963a7b2ecf58911ad (diff) | |
| parent | 344babaa9d39b10b85cadec4e5335d43b52b4ec0 (diff) | |
| download | linux-0dd7f883a9e21c5f2ff5e8f1cbb0e78cdc044d8a.tar.xz | |
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
| -rw-r--r-- | Documentation/DocBook/mcabook.tmpl | 2 | ||||
| -rw-r--r-- | drivers/net/wan/syncppp.c | 1 | ||||
| -rw-r--r-- | drivers/scsi/libata-core.c | 4 | ||||
| -rw-r--r-- | include/sound/pcm.h | 2 | ||||
| -rw-r--r-- | kernel/sched.c | 1 |
5 files changed, 6 insertions, 4 deletions
diff --git a/Documentation/DocBook/mcabook.tmpl b/Documentation/DocBook/mcabook.tmpl index 4367f46..42a760c 100644 --- a/Documentation/DocBook/mcabook.tmpl +++ b/Documentation/DocBook/mcabook.tmpl @@ -96,7 +96,7 @@ <chapter id="pubfunctions"> <title>Public Functions Provided</title> -!Earch/i386/kernel/mca.c +!Edrivers/mca/mca-legacy.c </chapter> <chapter id="dmafunctions"> diff --git a/drivers/net/wan/syncppp.c b/drivers/net/wan/syncppp.c index f58c794..b56a7b5 100644 --- a/drivers/net/wan/syncppp.c +++ b/drivers/net/wan/syncppp.c @@ -1440,6 +1440,7 @@ static void sppp_print_bytes (u_char *p, u16 len) * @skb: The buffer to process * @dev: The device it arrived on * @p: Unused + * @orig_dev: Unused * * Protocol glue. This drives the deferred processing mode the poorer * cards use. This can be called directly by cards that do not have diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c index 9fb9814..5cc53cd 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/scsi/libata-core.c @@ -2531,7 +2531,7 @@ void swap_buf_le16(u16 *buf, unsigned int buf_words) * @ap: port to read/write * @buf: data buffer * @buflen: buffer length - * @do_write: read/write + * @write_data: read/write * * Transfer data from/to the device data register by MMIO. * @@ -2577,7 +2577,7 @@ static void ata_mmio_data_xfer(struct ata_port *ap, unsigned char *buf, * @ap: port to read/write * @buf: data buffer * @buflen: buffer length - * @do_write: read/write + * @write_data: read/write * * Transfer data from/to the device data register by PIO. * diff --git a/include/sound/pcm.h b/include/sound/pcm.h index fa23ebf..389e8eb 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -903,7 +903,7 @@ int snd_pcm_format_unsigned(snd_pcm_format_t format); int snd_pcm_format_linear(snd_pcm_format_t format); int snd_pcm_format_little_endian(snd_pcm_format_t format); int snd_pcm_format_big_endian(snd_pcm_format_t format); -/** +/* * snd_pcm_format_cpu_endian - Check the PCM format is CPU-endian * @format: the format to check * diff --git a/kernel/sched.c b/kernel/sched.c index 9508527..18b9552 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -1478,6 +1478,7 @@ static inline void prepare_task_switch(runqueue_t *rq, task_t *next) /** * finish_task_switch - clean up after a task-switch + * @rq: runqueue associated with task-switch * @prev: the thread we just switched away from. * * finish_task_switch must be called after the context switch, paired |