Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (79 commits) Jesper Juhl is the new trivial patches maintainer Documentation: mention email-clients.txt in SubmittingPatches fs/binfmt_elf.c: spello fix do_invalidatepage() comment typo fix Documentation/filesystems/porting fixes typo fixes in net/core/net_namespace.c typo fix in net/rfkill/rfkill.c typo fixes in net/sctp/sm_statefuns.c lib/: Spelling fixes kernel/: Spelling fixes include/scsi/: Spelling fixes include/linux/: Spelling fixes include/asm-m68knommu/: Spelling fixes include/asm-frv/: Spelling fixes fs/: Spelling fixes drivers/watchdog/: Spelling fixes drivers/video/: Spelling fixes drivers/ssb/: Spelling fixes drivers/serial/: Spelling fixes drivers/scsi/: Spelling fixes ...
This commit is contained in:
Linus Torvalds
commit
f5bb3a5e9d
255 changed files with 381 additions and 441 deletions
|
|
@ -108,7 +108,7 @@ struct changer_element_status {
|
|||
|
||||
/*
|
||||
* CHIOGELEM
|
||||
* get more detailed status informtion for a single element
|
||||
* get more detailed status information for a single element
|
||||
*/
|
||||
struct changer_get_element {
|
||||
int cge_type; /* type/unit */
|
||||
|
|
|
|||
|
|
@ -177,7 +177,7 @@ struct CUSTOM_REG {
|
|||
__u32 fpga_version; /* FPGA Version Number Register */
|
||||
__u32 cpu_start; /* CPU start Register (write) */
|
||||
__u32 cpu_stop; /* CPU stop Register (write) */
|
||||
__u32 misc_reg; /* Miscelaneous Register */
|
||||
__u32 misc_reg; /* Miscellaneous Register */
|
||||
__u32 idt_mode; /* IDT mode Register */
|
||||
__u32 uart_irq_status; /* UART IRQ status Register */
|
||||
__u32 clear_timer0_irq; /* Clear timer interrupt Register */
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ struct cycx_x25_cmd {
|
|||
* @n2win - level 2 window (values: 1 thru 7)
|
||||
* @n3win - level 3 window (values: 1 thru 7)
|
||||
* @nvc - # of logical channels (values: 1 thru 64)
|
||||
* @pktlen - level 3 packet lenght - log base 2 of size
|
||||
* @pktlen - level 3 packet length - log base 2 of size
|
||||
* @locaddr - my address
|
||||
* @remaddr - remote address
|
||||
* @t1 - time, in seconds
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#ifndef _ASM_LINUX_DMA_MAPPING_H
|
||||
#define _ASM_LINUX_DMA_MAPPING_H
|
||||
#ifndef _LINUX_DMA_MAPPING_H
|
||||
#define _LINUX_DMA_MAPPING_H
|
||||
|
||||
#include <linux/device.h>
|
||||
#include <linux/err.h>
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
#include <linux/dma-mapping.h>
|
||||
|
||||
/**
|
||||
* enum dma_state - resource PNP/power managment state
|
||||
* enum dma_state - resource PNP/power management state
|
||||
* @DMA_RESOURCE_SUSPEND: DMA device going into low power state
|
||||
* @DMA_RESOURCE_RESUME: DMA device returning to full power
|
||||
* @DMA_RESOURCE_AVAILABLE: DMA device available to the system
|
||||
|
|
|
|||
|
|
@ -309,7 +309,7 @@ int ethtool_op_set_flags(struct net_device *dev, u32 data);
|
|||
* get_ringparam: Report ring sizes
|
||||
* set_ringparam: Set ring sizes
|
||||
* get_pauseparam: Report pause parameters
|
||||
* set_pauseparam: Set pause paramters
|
||||
* set_pauseparam: Set pause parameters
|
||||
* get_rx_csum: Report whether receive checksums are turned on or off
|
||||
* set_rx_csum: Turn receive checksum on or off
|
||||
* get_tx_csum: Report whether transmit checksums are turned on or off
|
||||
|
|
|
|||
|
|
@ -1308,7 +1308,7 @@ struct super_operations {
|
|||
* being set. find_inode() uses this to prevent returning
|
||||
* nearly-dead inodes.
|
||||
* I_SYNC Similar to I_LOCK, but limited in scope to writeback
|
||||
* of inode dirty data. Having a seperate lock for this
|
||||
* of inode dirty data. Having a separate lock for this
|
||||
* purpose reduces latency and prevents some filesystem-
|
||||
* specific deadlocks.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -364,7 +364,7 @@ typedef struct hd_drive_hob_hdr {
|
|||
#define SETFEATURES_EN_RLA 0xAA /* Enable read look-ahead feature */
|
||||
#define SETFEATURES_PREFETCH 0xAB /* Sets drive prefetch value */
|
||||
#define SETFEATURES_EN_REST 0xAC /* ATA-1 */
|
||||
#define SETFEATURES_4B_RW_LONG 0xBB /* Set Lenght of 4 bytes */
|
||||
#define SETFEATURES_4B_RW_LONG 0xBB /* Set Length of 4 bytes */
|
||||
#define SETFEATURES_DIS_AAM 0xC2 /* Disable Automatic Acoustic Management */
|
||||
#define SETFEATURES_EN_RPOD 0xCC /* Enable reverting to power on defaults */
|
||||
#define SETFEATURES_DIS_RI 0xDD /* Disable release interrupt ATAPI */
|
||||
|
|
|
|||
|
|
@ -147,7 +147,6 @@ struct hrtimer_sleeper {
|
|||
* @get_time: function to retrieve the current time of the clock
|
||||
* @get_softirq_time: function to retrieve the current time from the softirq
|
||||
* @softirq_time: the time when running the hrtimer queue in the softirq
|
||||
* @cb_pending: list of timers where the callback is pending
|
||||
* @offset: offset of this clock to the monotonic base
|
||||
* @reprogram: function to reprogram the timer event
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -49,9 +49,9 @@ enum llc_sockopts {
|
|||
|
||||
/* LLC SAP types. */
|
||||
#define LLC_SAP_NULL 0x00 /* NULL SAP. */
|
||||
#define LLC_SAP_LLC 0x02 /* LLC Sublayer Managment. */
|
||||
#define LLC_SAP_LLC 0x02 /* LLC Sublayer Management. */
|
||||
#define LLC_SAP_SNA 0x04 /* SNA Path Control. */
|
||||
#define LLC_SAP_PNM 0x0E /* Proway Network Managment. */
|
||||
#define LLC_SAP_PNM 0x0E /* Proway Network Management. */
|
||||
#define LLC_SAP_IP 0x06 /* TCP/IP. */
|
||||
#define LLC_SAP_BSPAN 0x42 /* Bridge Spanning Tree Proto */
|
||||
#define LLC_SAP_MMS 0x4E /* Manufacturing Message Srv. */
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ struct pm_dev
|
|||
};
|
||||
|
||||
/* Functions above this comment are list-based old-style power
|
||||
* managment. Please avoid using them. */
|
||||
* management. Please avoid using them. */
|
||||
|
||||
/*
|
||||
* Callbacks for platform drivers to implement.
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ struct pnp_resource_table {
|
|||
};
|
||||
|
||||
/*
|
||||
* Device Managemnt
|
||||
* Device Management
|
||||
*/
|
||||
|
||||
struct pnp_card {
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ do { \
|
|||
*
|
||||
* For API usage, in general,
|
||||
* - any function _modifying_ the tree or tags (inserting or deleting
|
||||
* items, setting or clearing tags must exclude other modifications, and
|
||||
* items, setting or clearing tags) must exclude other modifications, and
|
||||
* exclude any functions reading the tree.
|
||||
* - any function _reading_ the tree or tags (looking up items or tags,
|
||||
* gang lookups) must exclude modifications to the tree, but may occur
|
||||
|
|
|
|||
|
|
@ -185,7 +185,7 @@ struct reiserfs_journal {
|
|||
unsigned long j_trans_id;
|
||||
unsigned long j_mount_id;
|
||||
unsigned long j_start; /* start of current waiting commit (index into j_ap_blocks) */
|
||||
unsigned long j_len; /* lenght of current waiting commit */
|
||||
unsigned long j_len; /* length of current waiting commit */
|
||||
unsigned long j_len_alloc; /* number of buffers requested by journal_begin() */
|
||||
atomic_t j_wcount; /* count of writers for current commit */
|
||||
unsigned long j_bcount; /* batch count. allows turning X transactions into 1 */
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ struct signalfd_siginfo {
|
|||
|
||||
/*
|
||||
* Pad strcture to 128 bytes. Remember to update the
|
||||
* pad size when you add new memebers. We use a fixed
|
||||
* pad size when you add new members. We use a fixed
|
||||
* size structure to avoid compatibility problems with
|
||||
* future versions, and we leave extra space for additional
|
||||
* members. We use fixed size members because this strcture
|
||||
|
|
|
|||
|
|
@ -171,7 +171,7 @@
|
|||
/* USB slave/gadget data port base */
|
||||
#define SM501_USB_GADGET_DATA (0x070000)
|
||||
|
||||
/* Display contoller/video engine base */
|
||||
/* Display controller/video engine base */
|
||||
#define SM501_DC (0x080000)
|
||||
|
||||
/* common defines for the SM501 address registers */
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
/*
|
||||
* In the UP-nondebug case there's no real locking going on, so the
|
||||
* only thing we have to do is to keep the preempt counts and irq
|
||||
* flags straight, to supress compiler warnings of unused lock
|
||||
* flags straight, to suppress compiler warnings of unused lock
|
||||
* variables, and to add the proper checker annotations:
|
||||
*/
|
||||
#define __LOCK(lock) \
|
||||
|
|
|
|||
|
|
@ -1079,7 +1079,7 @@ struct iw_priv_args
|
|||
*/
|
||||
struct iw_event
|
||||
{
|
||||
__u16 len; /* Real lenght of this stuff */
|
||||
__u16 len; /* Real length of this stuff */
|
||||
__u16 cmd; /* Wireless IOCTL */
|
||||
union iwreq_data u; /* IOCTL fixed payload */
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue