diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 19:47:22 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 19:47:22 -0500 |
commit | 9073e1a804c3096eda84ee7cbf11d1f174236c75 (patch) | |
tree | 2f1b488b606bc03f8c5ce133f9158196fef07cd2 /include | |
parent | 4937e2a6f939a41bf811378e80d71f68aa0950c6 (diff) | |
parent | 2bb9936beac2eed0c1ed907f83694bc752e159d9 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"Usual earth-shaking, news-breaking, rocket science pile from
trivial.git"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (23 commits)
doc: usb: Fix typo in Documentation/usb/gadget_configs.txt
doc: add missing files to timers/00-INDEX
timekeeping: Fix some trivial typos in comments
mm: Fix some trivial typos in comments
irq: Fix some trivial typos in comments
NUMA: fix typos in Kconfig help text
mm: update 00-INDEX
doc: Documentation/DMA-attributes.txt fix typo
DRM: comment: `halve' -> `half'
Docs: Kconfig: `devlopers' -> `developers'
doc: typo on word accounting in kprobes.c in mutliple architectures
treewide: fix "usefull" typo
treewide: fix "distingush" typo
mm/Kconfig: Grammar s/an/a/
kexec: Typo s/the/then/
Documentation/kvm: Update cpuid documentation for steal time and pv eoi
treewide: Fix common typo in "identify"
__page_to_pfn: Fix typo in comment
Correct some typos for word frequency
clk: fixed-factor: Fix a trivial typo
...
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-generic/memory_model.h | 2 | ||||
-rw-r--r-- | include/linux/amba/serial.h | 2 | ||||
-rw-r--r-- | include/linux/devfreq.h | 2 | ||||
-rw-r--r-- | include/linux/mfd/si476x-core.h | 2 | ||||
-rw-r--r-- | include/linux/netdevice.h | 2 | ||||
-rw-r--r-- | include/net/bluetooth/l2cap.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/include/asm-generic/memory_model.h b/include/asm-generic/memory_model.h index aea9e45efce6..14909b0b9cae 100644 --- a/include/asm-generic/memory_model.h +++ b/include/asm-generic/memory_model.h | |||
@@ -53,7 +53,7 @@ | |||
53 | 53 | ||
54 | #elif defined(CONFIG_SPARSEMEM) | 54 | #elif defined(CONFIG_SPARSEMEM) |
55 | /* | 55 | /* |
56 | * Note: section's mem_map is encorded to reflect its start_pfn. | 56 | * Note: section's mem_map is encoded to reflect its start_pfn. |
57 | * section[i].section_mem_map == mem_map's address - start_pfn; | 57 | * section[i].section_mem_map == mem_map's address - start_pfn; |
58 | */ | 58 | */ |
59 | #define __page_to_pfn(pg) \ | 59 | #define __page_to_pfn(pg) \ |
diff --git a/include/linux/amba/serial.h b/include/linux/amba/serial.h index 62d9303c2837..0ddb5c02ad8b 100644 --- a/include/linux/amba/serial.h +++ b/include/linux/amba/serial.h | |||
@@ -40,7 +40,7 @@ | |||
40 | #define UART010_LCRL 0x10 /* Line control register, low byte. */ | 40 | #define UART010_LCRL 0x10 /* Line control register, low byte. */ |
41 | #define UART010_CR 0x14 /* Control register. */ | 41 | #define UART010_CR 0x14 /* Control register. */ |
42 | #define UART01x_FR 0x18 /* Flag register (Read only). */ | 42 | #define UART01x_FR 0x18 /* Flag register (Read only). */ |
43 | #define UART010_IIR 0x1C /* Interrupt indentification register (Read). */ | 43 | #define UART010_IIR 0x1C /* Interrupt identification register (Read). */ |
44 | #define UART010_ICR 0x1C /* Interrupt clear register (Write). */ | 44 | #define UART010_ICR 0x1C /* Interrupt clear register (Write). */ |
45 | #define ST_UART011_LCRH_RX 0x1C /* Rx line control register. */ | 45 | #define ST_UART011_LCRH_RX 0x1C /* Rx line control register. */ |
46 | #define UART01x_ILPR 0x20 /* IrDA low power counter register. */ | 46 | #define UART01x_ILPR 0x20 /* IrDA low power counter register. */ |
diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h index 7a7cc74d7f27..d48dc00232a4 100644 --- a/include/linux/devfreq.h +++ b/include/linux/devfreq.h | |||
@@ -168,7 +168,7 @@ struct devfreq { | |||
168 | unsigned long max_freq; | 168 | unsigned long max_freq; |
169 | bool stop_polling; | 169 | bool stop_polling; |
170 | 170 | ||
171 | /* information for device freqeuncy transition */ | 171 | /* information for device frequency transition */ |
172 | unsigned int total_trans; | 172 | unsigned int total_trans; |
173 | unsigned int *trans_table; | 173 | unsigned int *trans_table; |
174 | unsigned long *time_in_state; | 174 | unsigned long *time_in_state; |
diff --git a/include/linux/mfd/si476x-core.h b/include/linux/mfd/si476x-core.h index ba89b94e4a56..674b45d5a757 100644 --- a/include/linux/mfd/si476x-core.h +++ b/include/linux/mfd/si476x-core.h | |||
@@ -316,7 +316,7 @@ enum si476x_smoothmetrics { | |||
316 | * response to 'FM_RD_STATUS' command | 316 | * response to 'FM_RD_STATUS' command |
317 | * @rdstpptyint: Traffic program flag(TP) and/or program type(PTY) | 317 | * @rdstpptyint: Traffic program flag(TP) and/or program type(PTY) |
318 | * code has changed. | 318 | * code has changed. |
319 | * @rdspiint: Program indentifiaction(PI) code has changed. | 319 | * @rdspiint: Program identification(PI) code has changed. |
320 | * @rdssyncint: RDS synchronization has changed. | 320 | * @rdssyncint: RDS synchronization has changed. |
321 | * @rdsfifoint: RDS was received and the RDS FIFO has at least | 321 | * @rdsfifoint: RDS was received and the RDS FIFO has at least |
322 | * 'FM_RDS_INTERRUPT_FIFO_COUNT' elements in it. | 322 | * 'FM_RDS_INTERRUPT_FIFO_COUNT' elements in it. |
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 8b3de7cc2ffc..7f0ed423a360 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -1587,7 +1587,7 @@ static inline void *netdev_priv(const struct net_device *dev) | |||
1587 | #define SET_NETDEV_DEV(net, pdev) ((net)->dev.parent = (pdev)) | 1587 | #define SET_NETDEV_DEV(net, pdev) ((net)->dev.parent = (pdev)) |
1588 | 1588 | ||
1589 | /* Set the sysfs device type for the network logical device to allow | 1589 | /* Set the sysfs device type for the network logical device to allow |
1590 | * fin grained indentification of different network device types. For | 1590 | * fine-grained identification of different network device types. For |
1591 | * example Ethernet, Wirelss LAN, Bluetooth, WiMAX etc. | 1591 | * example Ethernet, Wirelss LAN, Bluetooth, WiMAX etc. |
1592 | */ | 1592 | */ |
1593 | #define SET_NETDEV_DEVTYPE(net, devtype) ((net)->dev.type = (devtype)) | 1593 | #define SET_NETDEV_DEVTYPE(net, devtype) ((net)->dev.type = (devtype)) |
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index 51329905bfaa..c853b16de4ef 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h | |||
@@ -240,7 +240,7 @@ struct l2cap_conn_rsp { | |||
240 | #define L2CAP_PSM_RFCOMM 0x0003 | 240 | #define L2CAP_PSM_RFCOMM 0x0003 |
241 | #define L2CAP_PSM_3DSP 0x0021 | 241 | #define L2CAP_PSM_3DSP 0x0021 |
242 | 242 | ||
243 | /* channel indentifier */ | 243 | /* channel identifier */ |
244 | #define L2CAP_CID_SIGNALING 0x0001 | 244 | #define L2CAP_CID_SIGNALING 0x0001 |
245 | #define L2CAP_CID_CONN_LESS 0x0002 | 245 | #define L2CAP_CID_CONN_LESS 0x0002 |
246 | #define L2CAP_CID_A2MP 0x0003 | 246 | #define L2CAP_CID_A2MP 0x0003 |